envvar fix?