Fix id bug with oid