diff --git a/include/asenum/asenum.h b/include/asenum/asenum.h
index 04d351f..48d74cb 100644
--- a/include/asenum/asenum.h
+++ b/include/asenum/asenum.h
@@ -146,7 +146,10 @@ private: \
     \
 public: \
     template <AssociatedEnum T_type> \
-    static ThisType create(typename CaseCast<T_type>::Type value) \
+    using UnderlyingType = typename CaseCast<T_type>::Type; \
+    \
+    template <AssociatedEnum T_type> \
+    static ThisType create(UnderlyingType<T_type> value) \
     { \
         return ThisType(T_type, std::move(value)); \
     } \
@@ -158,7 +161,7 @@ public: \
     } \
     \
     template <AssociatedEnum T_type> \
-    const typename CaseCast<T_type>::Type& as() const \
+    const UnderlyingType<T_type>& as() const \
     { \
         return validatedValueOfType<typename CaseCast<T_type>::Type>(T_type); \
     } \
diff --git a/tests/AsEnumTest.cpp b/tests/AsEnumTest.cpp
index 1f979b4..de73438 100644
--- a/tests/AsEnumTest.cpp
+++ b/tests/AsEnumTest.cpp
@@ -47,6 +47,10 @@ namespace
         ASENUM_CASE(StringOpt, std::string);
         ASENUM_CASE(BoolOpt, bool);
     };
+    
+    static_assert(std::is_same<TestAsEnum::UnderlyingType<TestEnum::Unknown>, int>::value, "Invalid underlying type");
+    static_assert(std::is_same<TestAsEnum::UnderlyingType<TestEnum::StringOpt>, std::string>::value, "Invalid underlying type");
+    static_assert(std::is_same<TestAsEnum::UnderlyingType<TestEnum::BoolOpt>, bool>::value, "Invalid underlying type");
 }
 
 TEST(AsEnum, NamedGetter)