Fix ordering of things in last commit that was broken

I am a noob and should not merge my own pull requests.
:(