Question number variables when retaking question bank assessments

Hi Community

I am working on a project which has an assessment using a question bank, the learner answers 3 questions from question bank 1 and 2 questions from question bank 2. 

I created a variable for the question number (1 to 5) on the correct/incorrect layers, which all works fine on the first attempt.

However, if they fail and need to retake the questions they got wrong, I want them to see the correct question number on the question they got wrong. E.g - when they take the assessment first time, it is Q2 of 5, but when they retake the questions they got wrong, all the incorrect questions will say Q5 of 5. 

The only way I can see it working, is if they have to answer 5 questions again rather than only answering the questions they didn't pass, and I add a trigger to reset the question number variable.

Is there a way of the question number being retained for when they retake the assessment? Can I create a variable for this?

Uploaded the SL file for reference.

Thanks in advance.