diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5b6f28a09d..4a586013bd 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-03  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* lyx2lyx/lyxconvert_218.py (update_tabular): Prevent changing
+	of non-tabular lines.
+
 2002-09-03  Angus Leeming  <leeming@lyx.org>
 
 	* scripts/lyxpreview2ppm.sh: re-written to make use of the "lyx"
diff --git a/lib/lyx2lyx/lyxconvert_218.py b/lib/lyx2lyx/lyxconvert_218.py
index f5ea8b0235..5044ae9225 100644
--- a/lib/lyx2lyx/lyxconvert_218.py
+++ b/lib/lyx2lyx/lyxconvert_218.py
@@ -404,11 +404,7 @@ def update_tabular(lines):
         if i == -1:
             break
 
-	j = find_end_of_tabular(lines, i+1)
-        if j == -1:
-            break
-
-	for k in xrange(i+1,j):
+	for k in get_tabular_lines(lines, i):
 	    if check_token(lines[k], "<lyxtabular"):
 		lines[k] = string.replace(lines[k], 'version="2"', 'version="3"')
 	    elif check_token(lines[k], "<column"):
@@ -417,7 +413,7 @@ def update_tabular(lines):
 	    if line_re.match(lines[k]):
 		lines[k] = re.sub(attr_re, "", lines[k])
 
-	i = j+1
+	i = i+1
 
 def change_preamble(lines):
     i = find_token(lines, "\\use_amsmath", 0)
diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py
index 3b15704eac..b16648a821 100644
--- a/lib/lyx2lyx/parser_tools.py
+++ b/lib/lyx2lyx/parser_tools.py
@@ -144,6 +144,21 @@ def find_beginning_of_inset(lines, i):
 def find_end_of_tabular(lines, i):
     return find_end_of(lines, i, "<lyxtabular", "</lyxtabular")
 
+def get_tabular_lines(lines, i):
+    result = []
+    i = i+1
+    j = find_end_of_tabular(lines, i)
+    if j == -1:
+	return []
+
+    while i <= j:
+	if check_token(lines[i], "\\begin_inset"):
+	    i = find_end_of_inset(lines, i)+1
+	else:
+	    result.append(i)
+	    i = i+1
+    return result
+
 def is_nonempty_line(line):
     return line != " "*len(line)