Fixes issue #152