fixes issue #2810