Fixed issue #2311