diff --git a/latest/src/gtk2/iocallback.c b/latest/src/gtk2/iocallback.c
index f79c918..72551f1 100644
--- a/latest/src/gtk2/iocallback.c
+++ b/latest/src/gtk2/iocallback.c
@@ -51,7 +51,7 @@
 #include "oia.h"
 
 #ifdef G_THREADS_ENABLED
-	static int static_CallAndWait(int(*callback)(void *), void *parm);
+	static int static_CallAndWait(int(*callback)(void *), H3270 *session, void *parm);
 #endif
 
 static unsigned long	static_AddInput(int source, H3270 *session, void (*fn)(H3270 *session));
@@ -303,7 +303,7 @@ gpointer BgCall(struct bgParameter *p)
 	return 0;
 }
 
-static int static_CallAndWait(int(*callback)(void *), void *parm)
+static int static_CallAndWait(int(*callback)(void *), H3270 *session, void *parm)
 {
 	struct bgParameter p = { TRUE, -1, callback, parm };
 	GThread	*thread;
diff --git a/latest/src/include/lib3270/api.h b/latest/src/include/lib3270/api.h
index b490f2f..6f7e2e5 100644
--- a/latest/src/include/lib3270/api.h
+++ b/latest/src/include/lib3270/api.h
@@ -435,7 +435,7 @@
 				unsigned long (*AddOutput)(int source, H3270 *session, void (*fn)(H3270 *session));
 			#endif /*]*/
 
-			int 			(*CallAndWait)(int(*callback)(void *), void *parm);
+			int 			(*CallAndWait)(int(*callback)(void *), H3270 *session, void *parm);
 
 			int				(*Wait)(int seconds);
 			int 			(*RunPendingEvents)(int wait);
@@ -594,7 +594,7 @@
 
 		#define Toggled(ix) lib3270_get_toogle(NULL,ix)
 
-		LIB3270_EXPORT int CallAndWait(int(*callback)(void *), void *parm);
+		LIB3270_EXPORT int CallAndWait(int(*callback)(void *), H3270 *session, void *parm);
 		LIB3270_EXPORT void RunPendingEvents(int wait);
 		LIB3270_EXPORT int Wait(int seconds);
 
diff --git a/latest/src/lib/XtGlue.c b/latest/src/lib/XtGlue.c
index f5566c3..512edb2 100644
--- a/latest/src/lib/XtGlue.c
+++ b/latest/src/lib/XtGlue.c
@@ -957,10 +957,10 @@ LIB3270_EXPORT int lib3270_in_e(H3270 *h)
 	return (h->cstate >= CONNECTED_INITIAL_E);
 }
 
-int CallAndWait(int(*callback)(void *),void *parm)
+int CallAndWait(int(*callback)(void *), H3270 *session, void *parm)
 {
 	if(callbacks->CallAndWait)
-		return callbacks->CallAndWait(callback,parm);
+		return callbacks->CallAndWait(callback,session,parm);
 	else
 		return callback(parm);
 }
diff --git a/latest/src/lib/resolver.c b/latest/src/lib/resolver.c
index 3dd293b..116f371 100644
--- a/latest/src/lib/resolver.c
+++ b/latest/src/lib/resolver.c
@@ -183,7 +183,7 @@ int resolve_host_and_port(const char *host, char *portname, unsigned short *ppor
 
 	Trace("Calling resolver for %s", p.host);
 
-	rc = CallAndWait((int (*)(void *)) cresolve_host_and_port,&p);
+	rc = CallAndWait((int (*)(void *)) cresolve_host_and_port,&h3270,&p);
 
 	Trace("Calling resolver for %s exits with %d", p.host, rc);
 
--
libgit2 0.21.2