Correctly return comments