Fixes envvar
2.6 only