Fixed issue #2341