Fixes issue #90