Fixes issue #1095