Merge "fix minor error"

No match.