Fixed issue #2870