Fixed the comments from the past issue