@fatmuemoo What do you think about my proposed change above? Can you update your PR? If not, just let me know and someone else can open a new PR with the tweak.

Cheers!