Fixes issue #250