Fixed issue with the new numbering of scenarios