Woops, missed a return statement in the last commit