diff --git a/cpp/table/runtime/keyselector/KeySelector.h b/cpp/table/runtime/keyselector/KeySelector.h
index 055a88dc2ae14007f7cc466fbbebc454e3b96b91..c7e63623704460db2067714d89b279200590d006 100644
--- a/cpp/table/runtime/keyselector/KeySelector.h
+++ b/cpp/table/runtime/keyselector/KeySelector.h
@@ -182,13 +182,13 @@ KeySelector<K>::KeySelector(const std::vector<int32_t> &keyColTypeIds, const std
                 // varchar and char has the possibility of being a dictionary vector due to StreamCalc filter
                 serializers.push_back(this->VarcharSerializer);
                 deserializers.push_back(omniruntime::op::vectorDeSerializerCenter[typeId]);
+            }  else if (typeId == omniruntime::type::OMNI_TIMESTAMP_WITHOUT_TIME_ZONE) {
+                serializers.push_back(omniruntime::op::vectorSerializerCenter[omniruntime::type::OMNI_LONG]);
+                deserializers.push_back(omniruntime::op::vectorDeSerializerCenter[omniruntime::type::OMNI_LONG]);
             } else if (typeId < omniruntime::type::OMNI_INVALID) {
                 // If it is one of the old omniruntime types
                 serializers.push_back(omniruntime::op::vectorSerializerCenter[typeId]);
                 deserializers.push_back(omniruntime::op::vectorDeSerializerCenter[typeId]);
-            } else if (typeId == omniruntime::type::OMNI_TIMESTAMP_WITHOUT_TIME_ZONE) {
-                serializers.push_back(omniruntime::op::vectorSerializerCenter[omniruntime::type::OMNI_LONG]);
-                deserializers.push_back(omniruntime::op::vectorDeSerializerCenter[omniruntime::type::OMNI_LONG]);
             } else {
                 throw std::runtime_error("Key type not supported!");
             }
diff --git a/cpp/test/runtime/checkpoint/channel/ChannelStateWriteRequestExecutorImplTest.cpp b/cpp/test/runtime/checkpoint/channel/ChannelStateWriteRequestExecutorImplTest.cpp
index e27583aa1255dc4246a07cd03b4640db8b714228..5e884a5eb1c235615ec4730fd8a7561182751ca4 100644
--- a/cpp/test/runtime/checkpoint/channel/ChannelStateWriteRequestExecutorImplTest.cpp
+++ b/cpp/test/runtime/checkpoint/channel/ChannelStateWriteRequestExecutorImplTest.cpp
@@ -216,9 +216,9 @@ TEST(ChannelStateWriteRequestExecutorImplTest, PriorityRequests) {
     ));
     executor.submit(ChannelStateWriteRequest::completeInput(jvid, 6, 1));
     
-    dispatcher->waitFor(6);
+    dispatcher->waitFor(7);
 
-    EXPECT_EQ(dispatcher->processedRequests.size(), 6);
+    EXPECT_EQ(dispatcher->processedRequests.size(), 7);
     EXPECT_EQ(dispatcher->processedRequests[0], "Register");
     EXPECT_EQ(dispatcher->processedSubtaskIDs[0], 0);