Fixed the mess I made of the last commit

I have no idea what I did, but it should be good now.