Backport of the typo-fix