fixes issue #1957