Fix Renumbering methodology