Better fix for bug #861
2 files changed