Fixes issue #181