Oops, missed one of the final changes