Fix root comments creation