Fix for issue #288
Also fix for issue #288
Merge pull request #289 from bruttenberg/DEV2.4.0

Fixes for issue #288