Fixed the issue with overlapping environment variables