Fix issue with environment variables