Renumbering fixed