diff --git a/ws2012/P2P/uebungen/2/p2p_ex2/src/buffered/BufferedNetworkStack.java b/ws2012/P2P/uebungen/2/p2p_ex2/src/buffered/BufferedNetworkStack.java
index 7d8ac8a2..ed01b141 100644
--- a/ws2012/P2P/uebungen/2/p2p_ex2/src/buffered/BufferedNetworkStack.java
+++ b/ws2012/P2P/uebungen/2/p2p_ex2/src/buffered/BufferedNetworkStack.java
@@ -21,7 +21,7 @@ class BufferedNetworkStack {
 		public Element(int size, int id) {
 			chunks = new String[size];
 			this.id = id;
-			System.out.println("Created new Element, size: " + size);
+			// System.out.println("Created new Element, size: " + size);
 		}
 
 		public boolean isComplete() {
@@ -101,16 +101,16 @@ class BufferedNetworkStack {
 				// " of data #"
 				// + sessionId + ": " + received);
 
-				temp.get(sessionId).chunks[chunkId] = received.toString();
+				for (Element e : temp) {
+					if (e.id == sessionId) {
+						e.chunks[chunkId] = received.toString();
 
-				if (temp.get(sessionId).isComplete()) {
-					// Move from temp stack
-					Element e = temp.get(sessionId);
-
-					// TODO: Element auch wirklich löschen aber dann ändern sich
-					// die IDs
-					// temp.remove(e);
-					stack.add(e.toString());
+						if (e.isComplete()) {
+							temp.remove(e);
+							stack.add(e.toString());
+						}
+						break;
+					}
 				}
 				break;