Make it work without setting the env var