fix numbering system