fixes issue #2610