Fixes issue #106