Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp	(revision 16715)
+++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp	(revision 16716)
@@ -10988,5 +10988,10 @@
 		GetInputListOnVertices(&activeEpl[0],HydrologydcMaskEplactiveEnum);
 		for(int i=0;i<3;i++){
-			if(!reCast<bool>(activeEpl[i]))this->nodes[i]->Deactivate();
+			if(!reCast<bool>(activeEpl[i])){
+				this->nodes[i]->Deactivate();
+			}
+			else{
+				this->nodes[i]->Activate();
+			}
 		}
 	}
Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 16715)
+++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp	(revision 16716)
@@ -2960,5 +2960,10 @@
 	GetInputListOnVertices(&activeEpl[0],HydrologydcMaskEplactiveEnum);
 	for(int i=0;i<NUMVERTICES;i++){
-		if(!reCast<bool>(activeEpl[i]))this->nodes[i]->Deactivate();
+		if(!reCast<bool>(activeEpl[i])){
+			this->nodes[i]->Deactivate();
+		}
+		else{
+			this->nodes[i]->Activate();
+		}
 	}
 }
Index: /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp	(revision 16715)
+++ /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp	(revision 16716)
@@ -146,9 +146,10 @@
 				femmodel->parameters->SetParam(EplHeadSlopeYEnum,InputToL2ProjectEnum);
 				solutionsequence_linear(femmodel);
+
 				femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
-
 				femmodel->HydrologyEPLThicknessx();
-				//updating mask after the computation of the epl thickness
+				//updating mask after the computation of the epl thickness (Allow to close too thin EPL)
 				femmodel->HydrologyEPLupdateDomainx();
+
 				femmodel->HydrologyTransferx();
 				SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);
Index: /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_linear.cpp
===================================================================
--- /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_linear.cpp	(revision 16715)
+++ /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_linear.cpp	(revision 16716)
@@ -23,6 +23,6 @@
 	femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 	femmodel->UpdateConstraintsx();
+	SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);
 
-	SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);
 	CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
 	Reduceloadx(pf, Kfs, ys); delete Kfs;