diff --git a/src/common/dimensional_array.h b/src/common/dimensional_array.h
index a85965f2d..46d5d0032 100644
--- a/src/common/dimensional_array.h
+++ b/src/common/dimensional_array.h
@@ -29,8 +29,8 @@ namespace detail {
 template<typename T, std::size_t rank, std::size_t... sizes>
 struct DimensionalArrayExplicitRank;
 
-// Workaround for MSVC
-#if defined(_MSC_VER)
+// Workaround for VS2017 & VS 16.9.x
+#if defined(_MSC_VER) && (_MSC_VER < 1920 || _MSC_VER == 1928)
 
 template<std::size_t rank, std::size_t... sizes>
 struct GetRankSize