Fix the Environment