Fixed issue #2704