Another regression, permanent fix for #833.
Merge pull request #848 from dblock/fix-834

Complete fix for #834.