Thank you very much Jonathan, I was searching for this fix and it works! Looking forward to it being native in 4.20.
Thanks, Testy