Oops, fixed a bug in the last commit