[tcc-2013] Attempt to fix numbering take one