diff --git a/src/main/kotlin/core/serialization/Kryo.kt b/src/main/kotlin/core/serialization/Kryo.kt
index 0cbb28054d..afe66a934c 100644
--- a/src/main/kotlin/core/serialization/Kryo.kt
+++ b/src/main/kotlin/core/serialization/Kryo.kt
@@ -213,5 +213,7 @@ fun createKryo(k: Kryo = Kryo()): Kryo {
         immutables.forEach {
             register(it.java, ImmutableClassSerializer(it))
         }
+
+        // TODO: See if we can make Lazy<T> serialize properly so we can use "by lazy" in serialized object.
     }
 }