Address code review comment.