EnvVars fix