Fixed hotplug build