Fixes issue #241