Fixes issue #1455