Fixed issue #2344