Fixes issue #204