Issue #2361861 by eshta: Fix numbering of variations within unibar.