Better handling last comment information