Fix that mess