fixes issue #2815
fixes issue #2818