Fixes issue #97