Use oid and fixId everywhere for safety.