Fixes issue #93