diff --git a/src/tools/MultiValue.cpp b/src/tools/MultiValue.cpp
index 5635f1c699..fd26ccea18 100644
--- a/src/tools/MultiValue.cpp
+++ b/src/tools/MultiValue.cpp
@@ -58,9 +58,9 @@ void MultiValue::clearAll() {
   for(unsigned i=0; i<values.size(); ++i) values[i]=0;
   // Clear matrix derivative indices
   for(unsigned i=0; i<matrix_row_nderivatives.size(); ++i) {
-      unsigned base = i*nderivatives;
-      for(unsigned j=0; j<matrix_row_nderivatives[i]; ++j) matrix_force_stash[base + matrix_row_derivative_indices[i][j]] = 0;
-      matrix_row_nderivatives[i]=0;
+    unsigned base = i*nderivatives;
+    for(unsigned j=0; j<matrix_row_nderivatives[i]; ++j) matrix_force_stash[base + matrix_row_derivative_indices[i][j]] = 0;
+    matrix_row_nderivatives[i]=0;
   }
 #ifndef NDEBUG
   for(unsigned i=0; i<matrix_force_stash.size(); ++i) plumed_assert( fabs(matrix_force_stash[i])<epsilon );
diff --git a/src/valtools/VStack.cpp b/src/valtools/VStack.cpp
index 7f37d5145b..8faea68f02 100644
--- a/src/valtools/VStack.cpp
+++ b/src/valtools/VStack.cpp
@@ -151,21 +151,21 @@ void VStack::runEndOfRowJobs( const unsigned& ival, const std::vector<unsigned>
   std::vector<unsigned>& matrix_indices( myvals.getMatrixRowDerivativeIndices( nmat ) );
   plumed_assert( nmat_ind<matrix_indices.size() );
   if( actionInChain() ) {
-      for(unsigned i=0; i<getNumberOfArguments(); ++i) {
-        unsigned istrn = getPntrToArgument(i)->getPositionInStream();
-        for(unsigned k=0; k<myvals.getNumberActive(istrn); ++k) {
-            bool found=false; unsigned thisind=myvals.getActiveIndex(istrn,k);
-            for(unsigned j=0; j<nmat_ind; ++j) {
-                if( thisind==matrix_indices[j] ) { found=true; break; }
-            }
-            if( !found ) { matrix_indices[nmat_ind] = thisind; nmat_ind++; }
+    for(unsigned i=0; i<getNumberOfArguments(); ++i) {
+      unsigned istrn = getPntrToArgument(i)->getPositionInStream();
+      for(unsigned k=0; k<myvals.getNumberActive(istrn); ++k) {
+        bool found=false; unsigned thisind=myvals.getActiveIndex(istrn,k);
+        for(unsigned j=0; j<nmat_ind; ++j) {
+          if( thisind==matrix_indices[j] ) { found=true; break; }
         }
+        if( !found ) { matrix_indices[nmat_ind] = thisind; nmat_ind++; }
       }
-      myvals.setNumberOfMatrixRowDerivatives( nmat, nmat_ind );
+    }
+    myvals.setNumberOfMatrixRowDerivatives( nmat, nmat_ind );
   } else {
-      unsigned ncols = getConstPntrToComponent(0)->getShape()[0];
-      for(unsigned i=0; i<getNumberOfArguments(); ++i) matrix_indices[i] = i*ncols + ival;
-      myvals.setNumberOfMatrixRowDerivatives( nmat, getNumberOfArguments() );
+    unsigned ncols = getConstPntrToComponent(0)->getShape()[0];
+    for(unsigned i=0; i<getNumberOfArguments(); ++i) matrix_indices[i] = i*ncols + ival;
+    myvals.setNumberOfMatrixRowDerivatives( nmat, getNumberOfArguments() );
   }
 }