diff --git a/src/terminal/widget.c b/src/terminal/widget.c
index 6976819..8fcab85 100644
--- a/src/terminal/widget.c
+++ b/src/terminal/widget.c
@@ -829,7 +829,7 @@ void v3270_signal_emit(gpointer instance, enum V3270_SIGNAL signal_id, ...)
   va_list var_args;
 
   va_start (var_args, signal_id);
-  g_signal_emit_valist(instance, (guint) signal_id, 0, var_args);
+  g_signal_emit_valist(instance, v3270_widget_signal[signal_id], 0, var_args);
   va_end (var_args);
 
 }
diff --git a/src/trace/exec.c b/src/trace/exec.c
index 990cdf6..694e7a6 100644
--- a/src/trace/exec.c
+++ b/src/trace/exec.c
@@ -317,7 +317,7 @@
 	if(*args)
 		*(args++) = 0;
 
-	g_signal_emit(GTK_WIDGET(t), v3270_trace_signal[V3270_TRACE_SIGNAL_COMMAND], 0, cmdline, args, &handled);
+	v3270_trace_signal_emit(GTK_WIDGET(t), V3270_TRACE_SIGNAL_COMMAND, cmdline, args, &handled);
 
 	if(handled)
 		return 0;
diff --git a/src/trace/private.h b/src/trace/private.h
index 15ee545..38d8774 100644
--- a/src/trace/private.h
+++ b/src/trace/private.h
@@ -47,19 +47,18 @@
 	#include <lib3270/trace.h>
 
 	/// @brief V3270 Trace Signal list
-	enum
+	enum V3270_TRACE_SIGNAL
 	{
 		V3270_TRACE_SIGNAL_COMMAND,
 
 		V3270_TRACE_SIGNAL_LAST
 	};
 
-	G_GNUC_INTERNAL guint v3270_trace_signal[V3270_TRACE_SIGNAL_LAST];
-
 	G_GNUC_INTERNAL H3270				* v3270_trace_get_session(GtkWidget *widget);
 	G_GNUC_INTERNAL GtkWidget			* v3270_trace_get_terminal(GtkWidget *widget);
 	G_GNUC_INTERNAL GtkTextBuffer		* v3270_trace_get_text_buffer(GtkWidget *widget);
 	G_GNUC_INTERNAL GtkScrolledWindow	* v3270_trace_get_scrolled_window(GtkWidget *widget);
+	G_GNUC_INTERNAL void				  v3270_trace_signal_emit(gpointer instance, enum V3270_TRACE_SIGNAL signal_id, ...);
 
 	G_BEGIN_DECLS
 
diff --git a/src/trace/trace.c b/src/trace/trace.c
index fb0107e..bde20ec 100644
--- a/src/trace/trace.c
+++ b/src/trace/trace.c
@@ -91,7 +91,7 @@
 
  };
 
- guint v3270_trace_signal[V3270_TRACE_SIGNAL_LAST]	= { 0 };
+ static guint v3270_trace_signal[V3270_TRACE_SIGNAL_LAST] = { 0 };
 
  G_DEFINE_TYPE(V3270Trace, V3270Trace, GTK_TYPE_BOX);
 
@@ -535,4 +535,15 @@
  	return GTK_V3270_TRACE(widget)->scroll;
  }
 
+ void v3270_trace_signal_emit(gpointer instance, enum V3270_TRACE_SIGNAL signal_id, ...)
+ {
+
+	va_list var_args;
+
+	va_start (var_args, signal_id);
+	g_signal_emit_valist(instance, (guint) v3270_trace_signal[signal_id], 0, var_args);
+	va_end (var_args);
+
+ }
+
 
--
libgit2 0.21.2