Handle next oid in more complex situation