fix after objectId format change