Made it work for env lookups again