:facepalm:
Sorry, I have not re-tested the change after the restoration of the <code>j:if</code> condition.
I'll merge commits and re-submit the change