Try fixing corner renumbering