diff --git a/includes/node.inc b/includes/node.inc
index ca914a490a3..6b803a9e7b4 100644
--- a/includes/node.inc
+++ b/includes/node.inc
@@ -135,13 +135,13 @@ function node_save($node, $filter) {
     if (is_numeric($key)) {
       if (isset($node->$value)) {
           // The above check is mandatory.
-        $edit->$value = check_query($node->$value);
+        $edit->$value = $node->$value;
       }
     }
     else {
       if (isset($value)) {
           // The above check is mandatory.
-        $edit->$key = check_query($value);
+        $edit->$key = $value;
       }
     }
   }
@@ -176,8 +176,8 @@ function node_save($node, $filter) {
     // prepare the query:
     foreach ($node as $key => $value) {
       if (in_array($key, $fields)) {
-        $k[] = $key;
-        $v[] = "'$value'";
+        $k[] = check_query($key);
+        $v[] = "'". check_query($value) ."'";
       }
     }
 
@@ -201,7 +201,7 @@ function node_save($node, $filter) {
     // prepare the query:
     foreach ($node as $key => $value) {
       if (in_array($key, $fields)) {
-        $q[] = "$key = '$value'";
+        $q[] = check_query($key) ." = '". check_query($value) ."'";
       }
     }