Fix Figure Numbers