Fix comment loader