Fixup for numerical IDs