fixing break and numbering