Hi, Andrew,

Do you think my patch below is better?

Thanks!

------------->