Hi @Chi this is the patch as per your suggestions.
Thanks!