Fix on_comments?