fixes issue #1994