Fixes issue #98