translated by KayGuoWhu

This PR includes two commit, the first one may be a little mistake, and the second is correct.