Group fix when adding device.