Fixes issue #742