diff --git a/src/Magnum/Math/RectangularMatrix.h b/src/Magnum/Math/RectangularMatrix.h
index 0e2c2ab3d..4881246ea 100644
--- a/src/Magnum/Math/RectangularMatrix.h
+++ b/src/Magnum/Math/RectangularMatrix.h
@@ -793,7 +793,7 @@ template<std::size_t cols, std::size_t rows, class T> struct ConfigurationValue<
             }
 
             oldpos = pos+1;
-        } while(pos != std::string::npos);
+        } while(pos != std::string::npos && i != cols*rows);
 
         return result;
     }
diff --git a/src/Magnum/Math/Vector.h b/src/Magnum/Math/Vector.h
index 38e38d583..0f17e44f5 100644
--- a/src/Magnum/Math/Vector.h
+++ b/src/Magnum/Math/Vector.h
@@ -1411,7 +1411,7 @@ template<std::size_t size, class T> struct ConfigurationValue<Magnum::Math::Vect
             }
 
             oldpos = pos+1;
-        } while(pos != std::string::npos);
+        } while(pos != std::string::npos && i != size);
 
         return result;
     }