Fixed issue #2869