big fix for numbering