Fixed issue #2331