Fixing environmental variable issue