fixes issue #2623