Oops, forgot to swap a couple of function calls