Taking care of review comment.