Fixed an issue with environment variables