diff --git a/lib/lyx2lyx/lyx_1_6.py b/lib/lyx2lyx/lyx_1_6.py
index 0b2bf069c5..429ff5641e 100644
--- a/lib/lyx2lyx/lyx_1_6.py
+++ b/lib/lyx2lyx/lyx_1_6.py
@@ -2186,7 +2186,7 @@ def revert_subfig(document):
             if k == -1:
                 break
             # is the subfloat aligned?
-            al = find_token(document.body, '\\align ', k - 1)
+            al = find_token(document.body, '\\align ', k - 1, j)
             alignment_beg = ""
             alignment_end = ""
             if al != -1: