Fix for broken comment retrieval