Fixes issue #110