diff --git a/dash/include/dash/Matrix.h b/dash/include/dash/Matrix.h
index 1d4c49f94..fe7c9983d 100644
--- a/dash/include/dash/Matrix.h
+++ b/dash/include/dash/Matrix.h
@@ -609,54 +609,58 @@ class Matrix
   local_type sub_local() noexcept;
 
   /**
-   * Projection to given offset in first sub-dimension (column), same as
-   * \c sub<0>(n).
+   * Projection to given offset in second sub-dimension (column), same as
+   * \c sub<1>(n).
    *
    * \returns  A \ref MatrixRef object representing the nth column
    *
    * \see  sub
    * \see  row
    */
-  const_view_type<NumDimensions-1> col(
+  typename std::enable_if<NumDimensions==2, const_view_type<1>>::type
+  col(
     size_type n       ///< Column offset.
   ) const;
 
   /**
-   * Projection to given offset in first sub-dimension (column), same as
-   * \c sub<0>(n).
+   * Projection to given offset in second sub-dimension (column), same as
+   * \c sub<1>(n).
    *
    * \returns  A \ref MatrixRef object representing the nth column
    *
    * \see  sub
    * \see  row
    */
-  view_type<NumDimensions-1> col(
+  typename std::enable_if<NumDimensions==2, view_type<1>>::type
+  col(
     size_type n       ///< Column offset.
   );
 
   /**
-   * Projection to given offset in second sub-dimension (rows), same as
-   * \c sub<1>(n).
+   * Projection to given offset in first sub-dimension (rows), same as
+   * \c sub<0>(n).
    *
    * \returns  A \ref MatrixRef object representing the nth row
    *
    * \see  sub
    * \see  col
    */
-  const_view_type<NumDimensions-1> row(
+  typename std::enable_if<NumDimensions==2, const_view_type<1>>::type
+  row(
     size_type n       ///< Row offset.
   ) const;
 
   /**
-   * Projection to given offset in second sub-dimension (rows), same as
-   * \c sub<1>(n).
+   * Projection to given offset in first sub-dimension (rows), same as
+   * \c sub<0>(n).
    *
    * \returns  A \ref MatrixRef object representing the nth row
    *
    * \see  sub
    * \see  col
    */
-  view_type<NumDimensions-1> row(
+  typename std::enable_if<NumDimensions==2, view_type<1>>::type
+  row(
     size_type n       ///< Row offset.
   );
 
@@ -669,7 +673,8 @@ class Matrix
    *
    * \see  sub
    */
-  view_type<NumDimensions> cols(
+  typename std::enable_if<NumDimensions==2, view_type<2>>::type
+  cols(
     size_type offset, ///< Offset of first column in range.
     size_type range   ///< Number of columns in the range.
   );
@@ -683,7 +688,8 @@ class Matrix
    *
    * \see  sub
    */
-  view_type<NumDimensions> rows(
+  typename std::enable_if<NumDimensions==2, view_type<2>>::type
+  rows(
     size_type n,      ///< Offset of first row in range.
     size_type range   ///< Number of rows in the range.
   );
diff --git a/dash/include/dash/matrix/internal/Matrix-inl.h b/dash/include/dash/matrix/internal/Matrix-inl.h
index f7bc625c8..1eac8dd79 100644
--- a/dash/include/dash/matrix/internal/Matrix-inl.h
+++ b/dash/include/dash/matrix/internal/Matrix-inl.h
@@ -611,7 +611,8 @@ ::sub(
 }
 
 template <typename T, dim_t NumDim, typename IndexT, class PatternT, typename LocalMemT>
-MatrixRef<const T, NumDim, NumDim-1, PatternT, LocalMemT>
+  typename std::enable_if<(NumDim==2),
+    MatrixRef<const T, NumDim, 1, PatternT, LocalMemT>>::type
 Matrix<T, NumDim, IndexT, PatternT, LocalMemT>
 ::col(
   size_type n) const
@@ -620,7 +621,8 @@ ::col(
 }
 
 template <typename T, dim_t NumDim, typename IndexT, class PatternT, typename LocalMemT>
-MatrixRef<T, NumDim, NumDim-1, PatternT, LocalMemT>
+  typename std::enable_if<(NumDim==2),
+    MatrixRef<T, NumDim, 1, PatternT, LocalMemT>>::type
 Matrix<T, NumDim, IndexT, PatternT, LocalMemT>
 ::col(
   size_type n)
@@ -629,7 +631,8 @@ ::col(
 }
 
 template <typename T, dim_t NumDim, typename IndexT, class PatternT, typename LocalMemT>
-MatrixRef<const T, NumDim, NumDim-1, PatternT, LocalMemT>
+  typename std::enable_if<(NumDim==2),
+    MatrixRef<const T, NumDim, 1, PatternT, LocalMemT>>::type
 Matrix<T, NumDim, IndexT, PatternT, LocalMemT>
 ::row(
   size_type n) const
@@ -638,7 +641,8 @@ ::row(
 }
 
 template <typename T, dim_t NumDim, typename IndexT, class PatternT, typename LocalMemT>
-MatrixRef<T, NumDim, NumDim-1, PatternT, LocalMemT>
+  typename std::enable_if<(NumDim==2),
+    MatrixRef<T, NumDim, 1, PatternT, LocalMemT>>::type
 Matrix<T, NumDim, IndexT, PatternT, LocalMemT>
 ::row(
   size_type n)
@@ -647,7 +651,8 @@ ::row(
 }
 
 template <typename T, dim_t NumDim, typename IndexT, class PatternT, typename LocalMemT>
-MatrixRef<T, NumDim, NumDim, PatternT, LocalMemT>
+  typename std::enable_if<(NumDim==2),
+    MatrixRef<T, NumDim, 2, PatternT, LocalMemT>>::type
 Matrix<T, NumDim, IndexT, PatternT, LocalMemT>
 ::rows(
   size_type offset,
@@ -657,7 +662,8 @@ ::rows(
 }
 
 template <typename T, dim_t NumDim, typename IndexT, class PatternT, typename LocalMemT>
-MatrixRef<T, NumDim, NumDim, PatternT, LocalMemT>
+  typename std::enable_if<(NumDim==2),
+    MatrixRef<T, NumDim, 2, PatternT, LocalMemT>>::type
 Matrix<T, NumDim, IndexT, PatternT, LocalMemT>
 ::cols(
   size_type offset,