diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php
index 28d14f660..ae47d3045 100644
--- a/libraries/tbl_replace_fields.inc.php
+++ b/libraries/tbl_replace_fields.inc.php
@@ -1,7 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * f i e l d    u p l o a d e d    f r o m    a    f i l e
+ * handle field values (possibly uploaded from a file) 
  *
  * garvin: original if-clause checked, whether input was stored in a possible
  * fields_upload_XX var. Now check, if the field is set. If it is empty or a
diff --git a/tbl_replace.php b/tbl_replace.php
index 3aa262518..8b23482fd 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -228,7 +228,10 @@ foreach ($loop_array as $primary_key) {
         //  i n s e r t
         if ($is_insert) {
             // no need to add column into the valuelist
-            $query_values[] = $cur_value;
+            if (strlen($cur_value)) {
+                $query_values[] = $cur_value;
+                $query_fields[] = PMA_backquote($key);
+            }
 
         //  u p d a t e
         } elseif (!empty($me_fields_null_prev[$key])
@@ -270,10 +273,6 @@ unset($me_fields_prev, $me_funcs, $me_fields_type, $me_fields_null, $me_fields_n
 
 // Builds the sql query
 if ($is_insert && count($value_sets) > 0) {
-    // first inserted row -> prepare template
-    foreach ($me_fields as $key => $val) {
-        $query_fields[]   = PMA_backquote($key);
-    }
     $query[] = 'INSERT INTO ' . PMA_backquote($GLOBALS['db']) . '.' . PMA_backquote($GLOBALS['table'])
         . ' (' . implode(', ', $query_fields) . ') VALUES (' . implode('), (', $value_sets) . ')';