Thank you Zihao, I did notice the patch at the time but I didn't assume
that it had fixed the issue. 

I will stay patient for when it will be pushed upstream. Thank you for
your efforts.

Regards,
Haider Mirza