Fixes issue #111