Fixes issue #107