Fixed issue #2335