0.5.4 Comment recovery