Try to fix the mess