diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 9d0fe65bc..3801312cd 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -666,14 +666,10 @@ std::unique_ptr<std::vector<std::unique_ptr<GNSSBlockInterface>>> GNSSBlockFacto
                 {
                     apply_ = true;
                 }
+
             std::string acquisition_implementation_specific = configuration->property(
                     "Acquisition_Galileo" + boost::lexical_cast<std::string>(i) + ".implementation",
                     default_implementation);
-            std::string s = configuration->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", std::string("W"));
-            if( s.compare("1B") == 0 )
-                {
-                    apply_ = true;
-                }
             //(i.e. Acquisition_1B0.implementation=xxxx)
             if(acquisition_implementation_specific.compare(default_implementation) == 0)
                 {
diff --git a/src/core/receiver/gnss_flowgraph.cc b/src/core/receiver/gnss_flowgraph.cc
index 18755f2f4..0474a6a01 100644
--- a/src/core/receiver/gnss_flowgraph.cc
+++ b/src/core/receiver/gnss_flowgraph.cc
@@ -306,7 +306,7 @@ void GNSSFlowgraph::connect()
             std::string default_signal = configuration_->property("Channel.signal", std::string("1C"));
             std::string gnss_signal = (configuration_->property("Channel" + boost::lexical_cast<std::string>(i) + ".signal", default_signal));
 
-            while (gnss_signal != available_GNSS_signals_.front().get_signal() )
+            while (gnss_signal.compare(available_GNSS_signals_.front().get_signal()) != 0 )
                 {
                     available_GNSS_signals_.push_back(available_GNSS_signals_.front());
                     available_GNSS_signals_.pop_front();