Fixed issue #2382