Please let me know if this is a good fix.

Thanks,
Baoqiu