fix the mess