Fixes issue #205