diff --git a/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp b/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp
index 303b7f0..c5d94f7 100644
--- a/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp
+++ b/sapfor/experts/Sapfor_2017/_src/Transformations/private_removing.cpp
@@ -468,10 +468,8 @@ static SgExpression* substituteExpressions(SgExpression* exp,
     if (exp->variant() == ARRAY_REF)
     {
         const auto& refToExp = refToExpMap.find(exp->unparse());
-        if (refToExp == refToExpMap.end())
-            return exp;
-
-        return refToExp->second;
+        if (refToExp != refToExpMap.end())
+            return refToExp->second;
     }
     
     exp->setLhs(substituteExpressions(exp->lhs(), refToExpMap));