diff --git a/src/main/java/no/birkett/kiwi/Solver.java b/src/main/java/no/birkett/kiwi/Solver.java
index c5b0231..97bb3d2 100644
--- a/src/main/java/no/birkett/kiwi/Solver.java
+++ b/src/main/java/no/birkett/kiwi/Solver.java
@@ -530,7 +530,7 @@ public class Solver {
                 if(entering.getType() == Symbol.Type.INVALID){
                     throw new InternalSolverError("internal solver error");
                 }
-                rows.remove(entering);
+                rows.remove(leaving);
                 row.solveFor(leaving, entering);
                 substitute(entering, row);
                 rows.put(entering, row);