Add workaround for possible oid collisions