Fix for hotplug