Fixed issue #2347