diff --git a/src/common/dimensional_array.h b/src/common/dimensional_array.h
index b4b6a4a43..ea3de5ee4 100644
--- a/src/common/dimensional_array.h
+++ b/src/common/dimensional_array.h
@@ -29,6 +29,9 @@ namespace detail {
 template<typename T, std::size_t rank, std::size_t... sizes>
 struct DimensionalArrayExplicitRank;
 
+// Workaround for VC2017
+#if defined(_MSC_VER) && _MSC_VER < 1920
+
 template<std::size_t rank, std::size_t... sizes>
 struct GetRankSize
 {
@@ -41,6 +44,22 @@ using GetArrayImplType =
   std::array<std::conditional_t<rank == 1, T, DimensionalArrayExplicitRank<T, rank - 1, sizes...>>,
              GetRankSize<rank, sizes...>::value>;
 
+#else
+
+template<std::size_t rank, std::size_t... sizes>
+constexpr std::size_t GetRankSize()
+{
+  constexpr std::size_t size_array[] = {sizes...};
+  return size_array[rank - 1];
+}
+
+template<typename T, std::size_t rank, std::size_t... sizes>
+using GetArrayImplType =
+  std::array<std::conditional_t<rank == 1, T, DimensionalArrayExplicitRank<T, rank - 1, sizes...>>,
+             GetRankSize<rank, sizes...>()>;
+
+#endif
+
 template<typename T, std::size_t rank_param, std::size_t... sizes>
 struct DimensionalArrayExplicitRank : public GetArrayImplType<T, rank_param, sizes...>
 {