Fix for issue #151

...oat. Fixes #151