Fix for issue #153