diff --git a/server/TracyEvent.hpp b/server/TracyEvent.hpp
index a153a07e..c7cee48a 100755
--- a/server/TracyEvent.hpp
+++ b/server/TracyEvent.hpp
@@ -1,7 +1,7 @@
 #ifndef __TRACYEVENT_HPP__
 #define __TRACYEVENT_HPP__
 
-#include <vector>
+#include "TracyVector.hpp"
 
 namespace tracy
 {
@@ -11,7 +11,7 @@ struct Event
     int64_t start;
     int64_t end;
 
-    std::vector<Event*> child;
+    Vector<Event*> child;
 };
 
 enum { EventSize = sizeof( Event ) };
diff --git a/server/TracyView.cpp b/server/TracyView.cpp
index 2a007b08..4695e422 100755
--- a/server/TracyView.cpp
+++ b/server/TracyView.cpp
@@ -242,7 +242,7 @@ void View::NewZone( Event* zone )
         const auto lastend = m_timeline.back()->end;
         if( lastend != -1 && lastend < zone->start )
         {
-            m_timeline.emplace_back( zone );
+            m_timeline.push_back( zone );
         }
         else
         {
@@ -251,7 +251,7 @@ void View::NewZone( Event* zone )
     }
     else
     {
-        m_timeline.emplace_back( zone );
+        m_timeline.push_back( zone );
     }
 }
 
diff --git a/server/TracyView.hpp b/server/TracyView.hpp
index 7f914699..b1c556c0 100755
--- a/server/TracyView.hpp
+++ b/server/TracyView.hpp
@@ -13,6 +13,7 @@
 #include "../common/TracyQueue.hpp"
 #include "TracyEvent.hpp"
 #include "TracySlab.hpp"
+#include "TracyVector.hpp"
 
 namespace tracy
 {
@@ -58,7 +59,7 @@ private:
     // this block must be locked
     std::mutex m_lock;
     std::vector<float> m_mbps;
-    std::vector<Event*> m_timeline;
+    Vector<Event*> m_timeline;
     std::unordered_map<uint64_t, std::string> m_strings;
 
     // not used for vis - no need to lock