Actually do what I meant to do in last commit