envvar fix