Fixes issue #85