Good point.

@shimingfei Could you take a look at this?