diff --git a/pcbnew/router/pns_logger.cpp b/pcbnew/router/pns_logger.cpp
index fb02d599c4..13b0b8d399 100644
--- a/pcbnew/router/pns_logger.cpp
+++ b/pcbnew/router/pns_logger.cpp
@@ -54,7 +54,7 @@ void LOGGER::Save( const std::string& aFilename )
         uint64_t id = 0;
 
         fprintf( f, "event %d %d %d %s\n", evt.type, evt.p.x, evt.p.y,
-                 (const char*) evt.uuid.c_str() );
+                 static_cast<const char*>( evt.uuid.AsString().c_str() ) );
     }
 
     fclose( f );
@@ -67,11 +67,11 @@ void LOGGER::Log( LOGGER::EVENT_TYPE evt, const VECTOR2I& pos, const ITEM* item
 
     ent.type = evt;
     ent.p = pos;
-    ent.uuid = "null";
+    ent.uuid = KIID(0);
 
 
     if( item && item->Parent() )
-        ent.uuid = item->Parent()->m_Uuid.AsString();
+        ent.uuid = item->Parent()->m_Uuid;
 
     m_events.push_back( ent );
 }
diff --git a/pcbnew/router/pns_logger.h b/pcbnew/router/pns_logger.h
index d607021611..04145d282f 100644
--- a/pcbnew/router/pns_logger.h
+++ b/pcbnew/router/pns_logger.h
@@ -28,6 +28,7 @@
 #include <sstream>
 
 #include <math/vector2d.h>
+#include <kiid.h>
 
 class SHAPE_LINE_CHAIN;
 class SHAPE;
@@ -51,7 +52,7 @@ public:
     struct EVENT_ENTRY {
         VECTOR2I p;
         EVENT_TYPE type;
-        wxString uuid;
+        KIID uuid;
     };
 
     LOGGER();
diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index 32259fa89c..5477f1f2c4 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -540,7 +540,7 @@ void ROUTER_TOOL::saveRouterDebugLog()
     for( auto evt : events)
     {
         fprintf( f, "event %d %d %d %s\n", evt.p.x, evt.p.y, evt.type,
-                 (const char*) evt.uuid.c_str() );
+                 static_cast<const char*>( evt.uuid.AsString().c_str() ) );
     }
 
     fclose( f );