Fix issue 1464

Fixes issue #1464