Fix what we tie env value to