Oops, missed some changes in the last commit