fix for envvars