Fixes issue #610