diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 285d2b9b4..1bd189cbb 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -39,6 +39,9 @@ All notable changes to GNSS-SDR will be documented in this file.
   which caused issues when linking with some compilers.
 - Added support for Xilinx's Zynq UltraScale+ devices (requires the
   `-DENABLE_FPGA=ON` building option).
+- Fixed running time error if the binary is built with the
+  `-Wp,-D_GLIBCXX_ASSERTIONS` compiler option. This is added by default in some
+  GNU/Linux distributions.
 
 ### Improvements in Usability:
 
diff --git a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc
index cb47400d3..bb53237fe 100644
--- a/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc
+++ b/src/algorithms/signal_source/gnuradio_blocks/unpack_2bit_samples.cc
@@ -133,7 +133,7 @@ int unpack_2bit_samples::work(int noutput_items,
     // Handle endian swap if needed
     if (swap_endian_items_)
         {
-            work_buffer_.reserve(ninput_bytes);
+            work_buffer_ = std::vector<int8_t>(ninput_bytes);
             swapEndianness(in, work_buffer_, item_size_, ninput_items);
 
             in = const_cast<signed char const *>(&work_buffer_[0]);
diff --git a/src/tests/unit-tests/system-parameters/has_decoding_test.cc b/src/tests/unit-tests/system-parameters/has_decoding_test.cc
index b4dfc5a46..5f4c7930f 100644
--- a/src/tests/unit-tests/system-parameters/has_decoding_test.cc
+++ b/src/tests/unit-tests/system-parameters/has_decoding_test.cc
@@ -234,7 +234,7 @@ TEST(HAS_Test, Decoder)
                 }
         }
 
-    for (size_t p = init; p < read_pages.get_number_pages(); p++)
+    for (size_t p = init; p < read_pages.get_number_pages() - 1; p++)
         {
             auto has_page = has_tester->generate_has_page(pages[p], rx_time[p]);
             if (!has_page->has_message_string.empty())  // if not dummy