Allow specification of figure number