Attempt to fix everything