diff --git a/comment_limit.module b/comment_limit.module
index 70e34bf..4f71c4c 100644
--- a/comment_limit.module
+++ b/comment_limit.module
@@ -47,7 +47,7 @@ function comment_limit_node_load($nodes, $types) {
     // Check for limit and remove form
     if ($result = comment_limit_reached($node, $user)) {
       // Close comments
-      $node->comment = COMMENT_NODE_CLOSED;
+      //$node->comment = COMMENT_NODE_CLOSED;
       // Set comment_limit status.
       $node->comment_limit = TRUE;
     }
@@ -62,6 +62,9 @@ function comment_limit_node_view($node, $view_mode, $langcode) {
     // Explain what we've done here.
     // Mimic the validation made by the comment module
     if ($node->comment && $view_mode == 'full' && node_is_page($node) && empty($node->in_preview)) {
+      if (!empty($node->content['links']['comment']['#links']['comment-add'])) {
+        unset($node->content['links']['comment']['#links']['comment-add']);
+      }
       $node->content['comments']['comment_form'] = array(
         '#markup' => t('You have reached the comment limit for this content.'),
       );