Address the comment