More comment recovery