Trying to fix the mess