@adithya-menon,
That work-around is working well for me, thank you for your help!
Nice work, that version does indeed fix the issue for me.