diff --git a/plugins/channelmimo/interferometer/interferometersink.cpp b/plugins/channelmimo/interferometer/interferometersink.cpp
index da32318dd..282573ce1 100644
--- a/plugins/channelmimo/interferometer/interferometersink.cpp
+++ b/plugins/channelmimo/interferometer/interferometersink.cpp
@@ -83,20 +83,14 @@ void InterferometerSink::handleSinkFifo(unsigned int sinkIndex)
 
         if (part1begin != part1end) { // first part of FIFO data
             //qDebug("InterferometerSink::handleSinkFifo: part1-stream: %u count: %u", sinkIndex, count);
-            m_vectorBuffer.write(part1begin, part1end, false);
-            //processFifo(part1begin, part1end, sinkIndex);
+            processFifo(part1begin, part1end, sinkIndex);
         }
 
         if (part2begin != part2end) { // second part of FIFO data (used when block wraps around)
             //qDebug("InterferometerSink::handleSinkFifo: part2-stream: %u count: %u", sinkIndex, count);
-            m_vectorBuffer.append(part2begin, part2end);
-            //processFifo(part2begin, part2end, sinkIndex);
+            processFifo(part2begin, part2end, sinkIndex);
         }
 
-        SampleVector::iterator vbegin, vend;
-        m_vectorBuffer.read(vbegin, vend);
-        processFifo(vbegin, vend, sinkIndex);
-
         m_sinkFifos[sinkIndex].readCommit((unsigned int) count); // adjust FIFO pointers
         samplesDone += count;
     }
@@ -163,8 +157,7 @@ void InterferometerSink::handleInputMessages()
 
 	while ((message = m_inputMessageQueue.pop()) != 0)
 	{
-		if (handleMessage(*message))
-		{
+		if (handleMessage(*message)) {
 			delete message;
 		}
 	}
@@ -225,6 +218,7 @@ bool InterferometerSink::handleMessage(const Message& cmd)
     }
     else
     {
+        qDebug("InterferometerSink::handleMessage: unhandled: %s", cmd.getIdentifier());
         return false;
     }
 }
\ No newline at end of file
diff --git a/plugins/channelmimo/interferometer/interferometersink.h b/plugins/channelmimo/interferometer/interferometersink.h
index b68ed7c7a..2e7f99b35 100644
--- a/plugins/channelmimo/interferometer/interferometersink.h
+++ b/plugins/channelmimo/interferometer/interferometersink.h
@@ -22,7 +22,6 @@
 
 //#include "dsp/samplesinkvector.h"
 #include "dsp/samplesinkfifo.h"
-#include "dsp/samplesinkvector.h"
 #include "interferometerstreamsink.h"
 #include "interferometercorr.h"
 
@@ -120,7 +119,6 @@ private:
     BasebandSampleSink *m_spectrumSink;
     BasebandSampleSink *m_scopeSink;
 	MessageQueue m_inputMessageQueue; //!< Queue for asynchronous inbound communication
-    SampleSinkVector m_vectorBuffer;
     int m_count0, m_count1;
 
 private slots:
diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp
index e3a4e4eb7..736e786b6 100644
--- a/plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp
+++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp
@@ -173,6 +173,7 @@ void BladeRF2MIMO::startRx()
     }
 
     m_sourceThread = new BladeRF2MIThread(m_dev->getDev());
+    m_sampleMIFifo.reset();
     m_sourceThread->setFifo(&m_sampleMIFifo);
     m_sourceThread->setFcPos(m_settings.m_fcPos);
     m_sourceThread->setLog2Decimation(m_settings.m_log2Decim);