diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp
index 05ffc17e..2ca2c343 100755
--- a/client/TracyProfiler.cpp
+++ b/client/TracyProfiler.cpp
@@ -114,7 +114,7 @@ void Profiler::Worker()
                 char* ptr = buf;
                 for( int i=0; i<sz; i++ )
                 {
-                    const auto dsz = QueueDataSize[(uint8_t)item[i].hdr.type];
+                    const auto dsz = QueueDataSize[item[i].hdr.idx];
                     memcpy( ptr, item+i, dsz );
                     ptr += dsz;
                 }
diff --git a/common/TracyQueue.hpp b/common/TracyQueue.hpp
index 1f3e91c1..4cbca18f 100755
--- a/common/TracyQueue.hpp
+++ b/common/TracyQueue.hpp
@@ -30,7 +30,11 @@ struct QueueZoneEnd
 
 struct QueueHeader
 {
-    QueueType type;
+    union
+    {
+        QueueType type;
+        uint8_t idx;
+    };
     int64_t time;
 };
 
diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 15a1a024..b34cae41 100755
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -82,14 +82,14 @@ void View::Worker()
                 {
                     auto ev = (QueueItem*)ptr;
                     Process( *ev );
-                    ptr += QueueDataSize[(uint8_t)ev->hdr.type];
+                    ptr += QueueDataSize[ev->hdr.idx];
                 }
             }
             else
             {
                 QueueItem hdr;
                 if( !sock.Read( &hdr.hdr, sizeof( QueueHeader ), &tv, ShouldExit ) ) goto close;
-                if( !sock.Read( ((char*)&hdr) + sizeof( QueueHeader ), QueueDataSize[(uint8_t)hdr.hdr.type] - sizeof( QueueHeader ), &tv, ShouldExit ) ) goto close;
+                if( !sock.Read( ((char*)&hdr) + sizeof( QueueHeader ), QueueDataSize[hdr.hdr.idx] - sizeof( QueueHeader ), &tv, ShouldExit ) ) goto close;
                 Process( hdr );
             }
         }