Fixes issue #150