address the review comment of #373