Fixed commenting functionality