Fix multiple registration of devices