Fix the mess