Fix env var and move it up