Address the review comment