Fix bug in Ch+En names