diff --git a/BuildLinux.sh b/BuildLinux.sh
index 894da8aa6d..05f9c2a255 100755
--- a/BuildLinux.sh
+++ b/BuildLinux.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e # exit on first error
 
 export ROOT=`pwd`
 export NCORES=`nproc --all`
@@ -7,6 +6,8 @@ export CMAKE_BUILD_PARALLEL_LEVEL=${NCORES}
 FOUND_GTK2=$(dpkg -l libgtk* | grep gtk2)
 FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3)
 
+set -e # exit on first error
+
 function check_available_memory_and_disk() {
     FREE_MEM_GB=$(free -g -t | grep 'Mem:' | rev | cut -d" " -f1 | rev)
     MIN_MEM_GB=10
diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
index 80d5263030..ecb9806275 100644
--- a/src/libslic3r/GCode.cpp
+++ b/src/libslic3r/GCode.cpp
@@ -5449,7 +5449,7 @@ std::string GCode::set_extruder(unsigned int extruder_id, double print_z)
         old_retract_length = m_config.retraction_length.get_at(previous_extruder_id);
         old_retract_length_toolchange = m_config.retract_length_toolchange.get_at(previous_extruder_id);
         old_filament_temp = this->on_first_layer()? m_config.nozzle_temperature_initial_layer.get_at(previous_extruder_id) : m_config.nozzle_temperature.get_at(previous_extruder_id);
-        if (m_config.purge_in_prime_tower) {
+        if (m_config.purge_in_prime_tower || is_BBL_Printer()) {
             wipe_volume = flush_matrix[previous_extruder_id * number_of_extruders + extruder_id];
             wipe_volume *= m_config.flush_multiplier;
         } else {