Fix the environment