diff --git a/src/buffer/buffer.cpp b/src/buffer/buffer.cpp
index a016c5be..4e7c3dd4 100644
--- a/src/buffer/buffer.cpp
+++ b/src/buffer/buffer.cpp
@@ -214,26 +214,22 @@ namespace Buffer {
       if (thisStream->getIPInput().connected()){
         if (!connected){
           connected = true;
-          thisStream->getIPInput().setBlocking(false);
+          thisStream->getIPInput().setBlocking(true);
         }
         if (thisStream->getIPInput().spool()){
-          while (true){
-            thisStream->getWriteLock();
-            if (thisStream->getStream()->parsePacket(thisStream->getIPInput().Received())){
+
+           thisStream->getWriteLock();
+           bool newPackets = false;
+            while (thisStream->getStream()->parsePacket(thisStream->getIPInput().Received())){
               if (thisStream->getStream()->metadata.isMember("reset")){
                 thisStream->disconnectUsers();
                 thisStream->getStream()->metadata.removeMember("reset");
                 thisStream->getStream()->metadata.netPrepare();
               }
-              thisStream->dropWriteLock(true);
-            }else{
-              thisStream->dropWriteLock(false);
-              //Util::sleep(10); //10ms wait
-              break;
+              newPackets = true;
             }
-          }
-        //}else{
-          //Util::sleep(500); //500ms wait
+            thisStream->dropWriteLock(newPackets);
+
         }
       }else{
         if (connected){
diff --git a/src/buffer/buffer_stream.cpp b/src/buffer/buffer_stream.cpp
index 45d7e46c..84f74918 100644
--- a/src/buffer/buffer_stream.cpp
+++ b/src/buffer/buffer_stream.cpp
@@ -179,6 +179,9 @@ namespace Buffer {
   ///\brief Drops a previously obtained write lock.
   ///\param newPacketsAvailable Whether new packets are available to update the index.
   void Stream::dropWriteLock(bool newPacketsAvailable){
+    if (newPacketsAvailable){
+      Strm->metadata.netPrepare();
+    }
     rw_mutex.lock();
     writers--;
     rw_mutex.unlock();