Index: TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml
===================================================================
diff -u -r9 -r71
--- TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml	(.../QueryBuilder.cls.xml)	(revision 9)
+++ TECH/Algo/SQL/QueryEngine/QueryBuilder.cls.xml	(.../QueryBuilder.cls.xml)	(revision 71)
@@ -108,9 +108,14 @@
 <Implementation><![CDATA[
 	Set TabellenIterator = ##class(TECH.ListIterator).%New(..Tabellen)
 	
-	If ('$IsObject(..FromTabel)) && (TabellenIterator.HasNext()) Do ..ZetFromTabel(TabellenIterator.Next())
+	If ('$IsObject(..FromTabel)) && (TabellenIterator.HasNext())
+	{
+		Do ..ZetFromTabel(TabellenIterator.Next())
+		Do ..Tabellen.RemoveAt(TabellenIterator.Key())
+		Set TabellenIterator = ##class(TECH.ListIterator).%New(..Tabellen)
+	}
 	
-	Set Query = "SELECT"_..GeefLimiteerTotString()_..GeefTeSelecterenVeldenString()_" "_..GeefFromTabelString()
+	#dim Query As %String = "SELECT"_..GeefLimiteerTotString()_..GeefTeSelecterenVeldenString()_" "_..GeefFromTabelString()
 	While (TabellenIterator.HasNext()) { Set Query = Query_" "_..GeefJoinTabelString(TabellenIterator.Next()) }
 	If ($IsObject(..WhereConditie)) && ..WhereConditie.HeeftConditie() {
 		Set Query = Query_" WHERE "_..WhereConditie.MaakConditieString()