Oops, forgot two lines in the last commit