hotplug fix part2