I’m very sorry for the late reply, but I was ill and in bed for the last couple of days.
Thanks a lot for the report and fix. Yes that is a fine fix and I will add it in the next update as well.
I will also double check the rest of the nodes for such resetting.