Fixes issue #88