diff --git a/src/olympic/keel/include/keel/typeconv.hpp b/src/olympic/keel/include/keel/typeconv.hpp
index 6bf9756b..aa9ca388 100644
--- a/src/olympic/keel/include/keel/typeconv.hpp
+++ b/src/olympic/keel/include/keel/typeconv.hpp
@@ -94,16 +94,16 @@ class Converter: public BaseConverter {
 
 		[[nodiscard]]
 		bool srcMatches(ox::CRStringView pSrcTypeName, int pSrcTypeVersion) const noexcept final {
-			static const auto SrcTypeName = ox::requireModelTypeName<SrcType>();
-			static const auto SrcTypeVersion = ox::requireModelTypeVersion<SrcType>();
+			constexpr auto SrcTypeName = ox::requireModelTypeName<SrcType>();
+			constexpr auto SrcTypeVersion = ox::requireModelTypeVersion<SrcType>();
 			return pSrcTypeName == SrcTypeName
 				 && pSrcTypeVersion == SrcTypeVersion;
 		}
 
 		[[nodiscard]]
 		bool dstMatches(ox::CRStringView dstTypeName, int dstTypeVersion) const noexcept final {
-			static const auto DstTypeName = ox::StringView(ox::requireModelTypeName<DstType>());
-			static const auto DstTypeVersion = ox::requireModelTypeVersion<DstType>();
+			constexpr auto DstTypeName = ox::StringView(ox::requireModelTypeName<DstType>());
+			constexpr auto DstTypeVersion = ox::requireModelTypeVersion<DstType>();
 			return dstTypeName == DstTypeName
 				 && dstTypeVersion == DstTypeVersion;
 		}