Fix Colin's #5 solution to actually solve the correct problem