Fixes issue #460