diff --git a/src/input/input_buffer.cpp b/src/input/input_buffer.cpp
index 307b5a78..331d51f6 100644
--- a/src/input/input_buffer.cpp
+++ b/src/input/input_buffer.cpp
@@ -217,12 +217,14 @@ namespace Mist {
             curPage.erase(tid);
             bufferLocations[tid].erase(bufferLocations[tid].begin());
           }
+          if (pushLocation.count(it->first)){
+            pushLocation.erase(it->first);
+          }
           curPageNum.erase(it->first);
           metaPages[it->first].master = true;
           metaPages.erase(it->first);
           activeTracks.erase(it->first);
-          pushLocation.erase(it->first);
-          myMeta.tracks.erase(it);
+          myMeta.tracks.erase(it->first);
           changed = true;
           break;
         }