Hi @xjm,
I hope this is the final change. I have updated the patch as per you...