Fixed double comments loading