Event Application Question Details lost when removing unrelated question

When removing a question from the event edit page of an event when there are already completed applications if the question removed is not the last; answers for the last question are lost and question answers below the deleted question are moved by 1 place.

I.e
Before removing question

Question 1: Answer 1
Question 2: Answer 2
Question 3: Answer 3
Question 4: Answer 4
Question 5: Answer 5

Delete question 4 and then review existing applications
Question 1: Answer 1
Question 2: Answer 2
Question 3: Answer 3
Question 5: Answer 4

It appears that the question content of question 5 has its internal ‘question number’ updated to 4 the identifier for answers is not updated. As such the existing answers for question 4 prior to deleting question 4 are retained and now the matching of question > answer does not make sense.

I have not tested if the Question 5 answers return if I make a new question.
Please see JudgeApps | Log In if you are an admin investigating this bug.
The first 3 applications to this event were posted before deleting the extra question