diff --git a/src/main/java/org/arend/typechecking/subexpr/CorrespondedSubExprVisitor.java b/src/main/java/org/arend/typechecking/subexpr/CorrespondedSubExprVisitor.java
index 54bf3f6e3..e9ede5f21 100644
--- a/src/main/java/org/arend/typechecking/subexpr/CorrespondedSubExprVisitor.java
+++ b/src/main/java/org/arend/typechecking/subexpr/CorrespondedSubExprVisitor.java
@@ -246,9 +246,9 @@ protected Pair<Expression, Concrete.Expression> visitParameter(Concrete.Paramete
       if (expression != null) return expression;
       Expression corePiCodomain = corePi.getCodomain();
       if (corePiCodomain instanceof PiExpression) corePi = (PiExpression) corePiCodomain;
-      else break;
+      else return codomain.accept(this, corePiCodomain);
     }
-    return codomain.accept(this, corePi);
+    return null;
   }
 
   @Nullable Pair<@NotNull Expression, Concrete.@NotNull Expression>