Repaired Figure numbering