Fix another regression (ENV merge)