Fix that ugly ass shit