Fix to load environment variables