Missed some the changes on the previous commit