Fix another issue with hypervisor_name change