Fixed issue #2958