Fix to Bug #10133
Merge pull request #685 from bocadillodeatun/fix_bug_10133

Fix to Bug #10133
Looks reasonable to me.