Fix environment variable problem