Awesome code fix for jareds bad code