Fixed figure numbering