fixes issue #2633