Fixed issue #2844