diff --git a/src/main/java/ti4/helpers/ButtonHelperHeroes.java b/src/main/java/ti4/helpers/ButtonHelperHeroes.java
index d2add84c93..fb47764b19 100644
--- a/src/main/java/ti4/helpers/ButtonHelperHeroes.java
+++ b/src/main/java/ti4/helpers/ButtonHelperHeroes.java
@@ -242,24 +242,13 @@ public static void argentHeroStep4(Game game, Player player, ButtonInteractionEv
             unitName = unitName.replace("damaged", "");
         }
         destination = FlipTileService.flipTileIfNeeded(event, destination, game);
-        RemoveUnitService.removeUnits(event, origin, game, player.getColor(), unitName + " " + unitHolderName);
-        AddUnitService.addUnits(event, destination, game, player.getColor(), unitName);
+        var removed = RemoveUnitService.removeUnits(
+                event, origin, game, player.getColor(), unitName + " " + unitHolderName, damaged);
+        AddUnitService.addUnits(event, destination, game, player.getColor(), unitName, removed);
         List<Button> buttons = getArgentHeroStep3Buttons(game, player, buttonID);
         String msg2 = player.getFactionEmoji() + " moved 1 " + unitName + " from "
                 + origin.getRepresentationForButtons(game, player) + " to "
                 + destination.getRepresentationForButtons(game, player);
-        if (damaged) {
-            origin.getUnitHolders()
-                    .get(unitHolderName)
-                    .removeDamagedUnit(Mapper.getUnitKey(AliasHandler.resolveUnit(unitName), player.getColorID()), 1);
-            destination
-                    .getUnitHolders()
-                    .get("space")
-                    .addDamagedUnit(Mapper.getUnitKey(AliasHandler.resolveUnit(unitName), player.getColorID()), 1);
-            msg2 = player.getFactionEmoji() + " moved 1 damaged " + unitName + " from "
-                    + origin.getRepresentationForButtons(game, player) + " to "
-                    + destination.getRepresentationForButtons(game, player);
-        }
 
         MessageHelper.sendMessageToChannel(event.getMessageChannel(), msg2);
         String msg =