diff --git a/ICD.Common.Utils/EnumUtils.cs b/ICD.Common.Utils/EnumUtils.cs
index a681dc1..be5ff95 100644
--- a/ICD.Common.Utils/EnumUtils.cs
+++ b/ICD.Common.Utils/EnumUtils.cs
@@ -58,6 +58,7 @@ namespace ICD.Common.Utils
 		/// <returns></returns>
 		public static bool IsEnum<T>(T value)
 		{
+// ReSharper disable once CompareNonConstrainedGenericWithNull
 			return value != null && IsEnumType(value.GetType());
 		}
 
@@ -165,7 +166,7 @@ namespace ICD.Common.Utils
 		private static IEnumerable<T> GetValuesUncached<T>()
 			where T : struct, IConvertible
 		{
-			return GetValuesUncached(typeof(T)).Cast<T>();
+			return GetValuesUncached(typeof(T)).Select(i => (T)(object)i);
 		}
 
 		/// <summary>