fix for hotplugging