[NTG-context] Bug: Figure numbers do not correspond to their order