Bug fix for new comment structure.