fixed the device_id thing