Fixed some numbering again