Fixed Things

I swear this works, just accept the pull request