Fix numbering, once and for all :no_mouth: