Fixed issue #2714