Thanks for the solution, Tanc!
I am working on making the patch.