add_device fix