Missed some code in previous commit