Fixed issue #2703