diff --git a/java/src/main/java/com/genexus/util/SubmitThreadPool.java b/java/src/main/java/com/genexus/util/SubmitThreadPool.java
index 8c95fedb8..dc613b8c3 100644
--- a/java/src/main/java/com/genexus/util/SubmitThreadPool.java
+++ b/java/src/main/java/com/genexus/util/SubmitThreadPool.java
@@ -75,7 +75,7 @@ public void run()
 		}
 
 		// Si llego aqui es porque tengo utilizados todos los thread, asi que encolo el submit
-		submitQueue.addElement(new Object[]{proc, new Integer(id), parameterPacker.toByteArray()});
+		submitQueue.addElement(new Object[]{proc, new Integer(id), parameterPacker.toByteArray(), ctx});
 	}
 
 	protected synchronized static void incRemainingSubmits()
@@ -206,7 +206,7 @@ public void run()
 			{ // Aqui debo sincronizar pues se setea la variable inUse
 				if(nextSubmit != null)
 				{
-					setProc((ISubmitteable)nextSubmit[0], ((Integer)nextSubmit[1]).intValue(), (Object[])new GXParameterUnpacker((byte[])nextSubmit[2]).readObject(), context);
+					setProc((ISubmitteable)nextSubmit[0], ((Integer)nextSubmit[1]).intValue(), (Object[])new GXParameterUnpacker((byte[])nextSubmit[2]).readObject(), (ModelContext) nextSubmit[3]);
 				}
 				else
 				{