diff --git a/preprocessor/SymbolTable.cc b/preprocessor/SymbolTable.cc
index 071db40d9..7043de839 100644
--- a/preprocessor/SymbolTable.cc
+++ b/preprocessor/SymbolTable.cc
@@ -371,7 +371,8 @@ int
 SymbolTable::searchAuxiliaryVars(int orig_symb_id, int orig_lead_lag) const
 {
   for (int i=0; i < aux_vars.size();++i)
-    if ((aux_vars[i].get_orig_symb_id() == orig_symb_id) && (aux_vars[i].get_orig_lead_lag() == orig_lead_lag))
+    if ((aux_vars[i].get_type() == avEndoLag || aux_vars[i].get_type() == avExoLag)
+        && aux_vars[i].get_orig_symb_id() == orig_symb_id && aux_vars[i].get_orig_lead_lag() == orig_lead_lag)
       return aux_vars[i].get_symb_id();
   return -1;
 }