Fix typo
Merge upstream