Corrected hotplugging system!