diff --git a/src/sdr/SDRPostThread.cpp b/src/sdr/SDRPostThread.cpp
index 237b744..d8feb96 100644
--- a/src/sdr/SDRPostThread.cpp
+++ b/src/sdr/SDRPostThread.cpp
@@ -214,6 +214,11 @@ void SDRPostThread::run() {
             
             // Find active demodulators
             if (nRunDemods) {
+                
+                for (int i = 0; i < numChannels; i++) {
+                    firpfbch2_crcf_set_channel_state(channelizer, i, (demodChannelActive[i]>0)?1:0);
+                }
+                
                 // channelize data
                 // firpfbch2 output rate is 2 x ( input rate / channels )
                 for (int i = 0, iMax = dataSize; i < iMax; i+=numChannels/2) {
diff --git a/src/sdr/SoapySDRThread.cpp b/src/sdr/SoapySDRThread.cpp
index 9104351..f43030a 100644
--- a/src/sdr/SoapySDRThread.cpp
+++ b/src/sdr/SoapySDRThread.cpp
@@ -245,9 +245,9 @@ int SDRThread::getOptimalChannelCount(long long sampleRate) {
         optimal_count = 4;
     }
     
-    if (optimal_count > 16) {
-        optimal_count = 16;
-    }
+//    if (optimal_count > 16) {
+//        optimal_count = 16;
+//    }
     return optimal_count;
 }