Fixed issue #2679