Changing environmental variables, fixing #2