Fix OID handling: