Fixes issue #1863

Fixes issue #1863