diff --git a/libraries/build_dump.lib.php3 b/libraries/build_dump.lib.php3
index 36f91b61c..4cd00feed 100644
--- a/libraries/build_dump.lib.php3
+++ b/libraries/build_dump.lib.php3
@@ -585,12 +585,12 @@ if (!defined('PMA_BUILD_DUMP_LIB_INCLUDED')){
             $buffer         .= '    <' . $table . '>' . $crlf;
             for ($i = 0; $i < $columns_cnt; $i++) {
                 // There is no way to dectect a "NULL" value with PHP3
-                if (!function_exists('is_null') || !is_null($record[$column[$i]])) {
-                    $buffer .= '        <' . $column . '>' . htmlspecialchars($record[$column])
-                            .  '</' . $column . '>' . $crlf;
+                if (!function_exists('is_null') || !is_null($record[$columns[$i]])) {
+                    $buffer .= '        <' . $columns[$i] . '>' . htmlspecialchars($record[$columns[$i]])
+                            .  '</' . $columns[$i] . '>' . $crlf;
                 }
             }
-            $buffer         .= '    </' . $table . '>';
+            $buffer         .= '    </' . $table . '>' . $crlf;
         }
         mysql_free_result($result);
 
diff --git a/tbl_dump.php3 b/tbl_dump.php3
index ca1785788..8e45294ea 100755
--- a/tbl_dump.php3
+++ b/tbl_dump.php3
@@ -300,11 +300,12 @@ else {
             $tmp_select = implode($table_select, '|');
             $tmp_select = '|' . $tmp_select . '|';
         }
+        $i = 0;
         while ($i < $num_tables) {
             if (!isset($single)) {
                 $table = mysql_tablename($tables, $i);
             }
-            if (isset($tmp_select) && strpos($tmp_select, ' |' . $table . '|')) {
+            if (isset($tmp_select) && strpos($tmp_select, ' |' . $table . '|')>=0) {
                 $dump_buffer .= PMA_getTableXML($db, $table, $crlf, $err_url) . $crlf;
             }
             $i++;