Fix broken switcher for numbering type