diff --git a/src/pw3270/tools.c b/src/pw3270/tools.c
index c1302e8..3cd708a 100644
--- a/src/pw3270/tools.c
+++ b/src/pw3270/tools.c
@@ -79,7 +79,7 @@ int libpw3270_unloaded(void)
 	return 0;
 }
 
-
+/*
 LIB3270_EXPORT gchar * pw3270_build_filename(GtkWidget *widget, const gchar *first_element, ...)
 {
 	va_list args;
@@ -90,6 +90,7 @@ LIB3270_EXPORT gchar * pw3270_build_filename(GtkWidget *widget, const gchar *fir
 	va_end(args);
 	return path;
 }
+*/
 
 LIB3270_EXPORT void pw3270_save_window_size(GtkWidget *widget, const gchar *name)
 {
diff --git a/src/pw3270/window.c b/src/pw3270/window.c
index 49111ac..a452b03 100644
--- a/src/pw3270/window.c
+++ b/src/pw3270/window.c
@@ -769,16 +769,18 @@ static GtkWidget * trace_window = NULL;
 
 	// Load UI
 	{
-		gchar *path = pw3270_build_filename(GTK_WIDGET(widget),"ui",NULL);
+#ifdef DEBUG
+		const char *path = "ui";
+#else
+		lib3270_autoptr(char) path = lib3270_build_data_filename("ui",NULL);
+#endif // DEBUG
 
 		if(ui_parse_xml_folder(GTK_WINDOW(widget),path,groupname,popupname,widget->terminal,widget_setup))
 		{
-			g_free(path);
 			gtk_widget_set_sensitive(widget->terminal,FALSE);
 			return;
 		}
 
-		g_free(path);
 	}
 
 
--
libgit2 0.21.2