Fixed issue #2340