Missed some stuff from the previous commit