Fixes issue #740

Fixes issue #740