diff -r 05b9a310fded -r e96662444ec6 server/msplanner.py
--- a/server/msplanner.py	Thu Jan 15 10:49:47 2009 +0100
+++ b/server/msplanner.py	Thu Jan 15 11:25:29 2009 +0100
@@ -661,7 +661,7 @@
                 if not var.scope is self.rqlst:
                     if isinstance(var, Variable):
                         return var, sourcevars.pop(var)
-                    secondchoice = var, sourcevars.pop(var)
+                    secondchoice = var
         else:
             # priority to variable outer scope
             for var in sourcevars: