Hi Rong,

Could you please submit the fix to the master branch?

I haven't solved the issue yet, but if I do, I'll push up a review.

cheers,

Andy