Well, I derped fixing the derp, but this fixes it in a cleaner/better
way.