Fixes bug #245.  The fix was also done in some of the fix of prior commit