Fixed ENVVARS