diff --git a/src/libslic3r/FilamentGroup.cpp b/src/libslic3r/FilamentGroup.cpp
index 59f2a83bc..5a7d461ac 100644
--- a/src/libslic3r/FilamentGroup.cpp
+++ b/src/libslic3r/FilamentGroup.cpp
@@ -534,7 +534,7 @@ namespace Slic3r
         if (used_filament_num < 10)
             return calc_filament_group_by_enum(layer_filaments, used_filaments, g_strategy, cost);
         else
-            return calc_filament_group_by_pam2(layer_filaments, used_filaments, g_strategy, cost, 300);
+            return calc_filament_group_by_pam2(layer_filaments, used_filaments, g_strategy, cost, 500);
     }
 
     // sorted used_filaments
diff --git a/src/libslic3r/GCode/ToolOrdering.cpp b/src/libslic3r/GCode/ToolOrdering.cpp
index ef65cfba0..75dedc732 100644
--- a/src/libslic3r/GCode/ToolOrdering.cpp
+++ b/src/libslic3r/GCode/ToolOrdering.cpp
@@ -978,7 +978,7 @@ std::vector<int> ToolOrdering::get_recommended_filament_maps(const std::vector<s
             fg.set_memory_threshold(0.02);
             fg.get_custom_seq = get_custom_seq;
 
-            ret = fg.calc_filament_group(layer_filaments, FGStrategy::BestFit);
+            ret = fg.calc_filament_group(layer_filaments, FGStrategy::BestCost);
 
             // optimize for master extruder id
             optimize_group_for_master_extruder(used_filaments, context, ret);