Fixed numbering, fixed bug