fixed stage numbering, again