Fixed comment retrieval
Fixed comment retrieval