diff --git a/Application/src/tracker/tracking/DatasetQuality.h b/Application/src/tracker/tracking/DatasetQuality.h
index 4bfb8daffdcf139e8eb66121408ebd3fe4effcda..6a25928cddf1cf5628496a77fb38bf18178552d7 100644
--- a/Application/src/tracker/tracking/DatasetQuality.h
+++ b/Application/src/tracker/tracking/DatasetQuality.h
@@ -26,7 +26,7 @@ namespace track {
             
             long_t number_frames;
             
-            Single(idx_t id = std::numeric_limits<idx_t>::max())
+            Single(idx_t id = infinity<idx_t>())
                 : id(id), midline_len(0), midline_std(0), distance_travelled(0), grid_cells_visited(0), median_angle_var(0), number_frames(0)
             { }
             
diff --git a/Application/src/tracker/tracking/Individual.h b/Application/src/tracker/tracking/Individual.h
index f2c7d10bd8a4c367876fff384c6eee770327a82b..fdd1e0a7007880e49e46891ee9915b244e9a6a29 100644
--- a/Application/src/tracker/tracking/Individual.h
+++ b/Application/src/tracker/tracking/Individual.h
@@ -114,7 +114,7 @@ namespace track {
     
     class Identity {
     public:
-        static constexpr auto InvalidID = std::numeric_limits<uint32_t>::max();
+        static constexpr auto InvalidID = infinity<uint32_t>();
         
     protected:
         GETTER_SETTER(gui::Color, color)