Fix analog numbering