Improve env retrigger handling