correct an error after merge with 1.7.0