Fixes issue #92