Fixes issue #144