Fixed issue #2337