diff --git a/src/FEmTool/FEmTool_ProfileMatrix.cxx b/src/FEmTool/FEmTool_ProfileMatrix.cxx
index 1f4e900454..15c7681ab5 100644
--- a/src/FEmTool/FEmTool_ProfileMatrix.cxx
+++ b/src/FEmTool/FEmTool_ProfileMatrix.cxx
@@ -108,7 +108,7 @@ FEmTool_ProfileMatrix::FEmTool_ProfileMatrix(const TColStd_Array1OfInteger& Firs
   SMA--;
   const Standard_Real * PM = &ProfileMatrix->Value(1);
   PM--;
-
+  IsDecomp = Standard_False;
   for(j = 1; j <= RowNumber(); j++) {
     DiagAddr = profile(2, j);
     Kj = j - profile(1, j);
@@ -118,7 +118,7 @@ FEmTool_ProfileMatrix::FEmTool_ProfileMatrix(const TColStd_Array1OfInteger& Firs
 
     a = PM[DiagAddr] - Sum;
     if(a < Eps) {
-      return IsDecomp = Standard_False;// Matrix is not positive defined
+      return Standard_False;// Matrix is not positive defined
     }
     a = Sqrt(a);
     SMA[DiagAddr] = a;
@@ -139,7 +139,8 @@ FEmTool_ProfileMatrix::FEmTool_ProfileMatrix(const TColStd_Array1OfInteger& Firs
       SMA[CurrAddr] = (PM[CurrAddr] - Sum)/a;
     }
   }
-  return IsDecomp = Standard_True;
+  IsDecomp = Standard_True;
+  return IsDecomp;
 }
 
 //=======================================================================
diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
index 630ac437f4..ef3f96aa70 100644
--- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
@@ -12619,8 +12619,7 @@ static int VManipulator (Draw_Interpretor& theDi,
     {
       anAttachOptions.SetAdjustSize (Draw::ParseOnOffNoIterator (theArgsNb, theArgVec, anArgIter) ? 1 : 0);
     }
-    else if (anArg == "-enablemodes"
-          || anArg == "-enablemodes")
+    else if (anArg == "-enablemodes")
     {
       anAttachOptions.SetEnableModes (Draw::ParseOnOffNoIterator (theArgsNb, theArgVec, anArgIter) ? 1 : 0);
     }