diff --git a/src/action.cxx b/src/action.cxx
index be6b7ae..764b778 100644
--- a/src/action.cxx
+++ b/src/action.cxx
@@ -1764,7 +1764,7 @@ static const DescAction action_table[] =
         {0},
     },
     {
-        ACTION_D_PICKAXE,
+        ACTION_D_SAW,
         CHBLUPI,
         {
             {1, 290},       // e
@@ -1839,7 +1839,7 @@ static const DescAction action_table[] =
         {0},
     },
     {
-        ACTION_D_SAW,
+        ACTION_D_PICKAXE,
         CHBLUPI,
         {
             {8, 290, 290, 304, 304, 290, 290, 292, 292}, // e
diff --git a/src/decblupi.cxx b/src/decblupi.cxx
index 06c4c21..7aff47c 100644
--- a/src/decblupi.cxx
+++ b/src/decblupi.cxx
@@ -728,13 +728,18 @@ CDecor::BlupiInitAction (Sint32 rank, Sint32 action, Sint32 direct)
     if (m_blupi[rank].action == ACTION_STOP)
       m_blupi[rank].action = ACTION_D_STOP;
 
-    if (m_blupi[rank].action == ACTION_PICKAXE)
+    if (
+      m_blupi[rank].action == ACTION_PICKAXE ||
+      m_blupi[rank].action == ACTION_BUILDSEC)
       m_blupi[rank].action = ACTION_D_PICKAXE;
 
     if (m_blupi[rank].action == ACTION_BUILD)
       m_blupi[rank].action = ACTION_D_BUILD;
 
-    if (m_blupi[rank].action == ACTION_SAW)
+    if (
+      m_blupi[rank].action == ACTION_SAW ||
+      m_blupi[rank].action == ACTION_BUILDSOURD ||
+      m_blupi[rank].action == ACTION_PIOCHESOURD)
       m_blupi[rank].action = ACTION_D_SAW;
 
     if (m_blupi[rank].action == ACTION_TCHAO)