Fixed issue #2332