Fixed issue #2643