Fixing Environment variable fetch