deviceid fix?