Fixed the review comments.

Fixed the review comments.

issue #2806