Work around the env var issue