Fixes issue #643