This should fix the env variables