This is a bit cleaner. I should have done it this way in the first place. :)