I agree with you here,  I will add that code.
@yumingfei  thanks for the review.