Fixed issue #2946