Fixes issue #115