Typo ported from master