Fixes issue #1732