Fix comment retrieval.