[FIX} Small issue with question numbering logic.