Fixed issue #2711