Add another workaround for oid collisions