Fixes issue #1688