A possible fix could be similar to the attached diff (just a quick test without checking for any unintended side-effects). I'll work in a branch and update the report later.
A possible fix could be similar to the attached diff (just a quick test without checking for any unintended side-effects). I'll work in a branch and update the report later.