Missed some replacements with the previous commit