Fixed issue #2855