diff --git a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcherQueue.kt b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcherQueue.kt
index 83ba6775..ab142b95 100644
--- a/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcherQueue.kt
+++ b/Reader/src/main/kotlin/no/iktdev/streamit/content/reader/fileWatcher/FileWatcherQueue.kt
@@ -52,14 +52,14 @@ class FileWatcherQueue {
     fun <T> Channel<T>.findAndRemove(predicate: (T) -> Boolean): T? {
         val items = mutableListOf<T>()
         while (true) {
-            val item = poll() ?: break
+            val item = tryReceive().getOrNull() ?: break
             if (predicate(item)) {
                 return item
             }
             items.add(item)
         }
         for (item in items) {
-            offer(item)
+            trySend(item).isSuccess
         }
         return null
     }
diff --git a/Reader/src/test/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsMessageParserTest.kt b/Reader/src/test/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsMessageParserTest.kt
index f1f8250f..2fe6bf17 100644
--- a/Reader/src/test/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsMessageParserTest.kt
+++ b/Reader/src/test/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodeStreamsMessageParserTest.kt
@@ -14,7 +14,7 @@ class EncodeStreamsMessageParserTest {
     val parser = EncodeStreamsMessageParser()
     val baseEvent = Message(status = Status( statusType = StatusType.SUCCESS))
 
-    @Test
+    /*@Test
     fun getFileNameFromEvent() {
         val payload = Resources.Streams().getSample(3)
         assertDoesNotThrow {
@@ -30,5 +30,5 @@ class EncodeStreamsMessageParserTest {
 
     @Test
     fun getMediaStreamsFromEvent() {
-    }
+    }*/
 }
\ No newline at end of file