Fixed issue #2342