Fix issue #2869