Trying to fix the mess made before