diff --git a/patches/server/Implement-Mob-Goal-API.patch b/patches/server/Implement-Mob-Goal-API.patch
index 13375a64b..31a49abc3 100644
--- a/patches/server/Implement-Mob-Goal-API.patch
+++ b/patches/server/Implement-Mob-Goal-API.patch
@@ -279,6 +279,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +        ignored.add("goal_selector_1");
 +        ignored.add("goal_selector_2");
++        ignored.add("selector_1");
++        ignored.add("selector_2");
 +        ignored.add("wrapped");
 +
 +        bukkitMap.put(net.minecraft.world.entity.Mob.class, Mob.class);
@@ -396,6 +398,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            }
 +        }
 +        name = name.replace("PathfinderGoal", "");
++        name = name.replace("TargetGoal", "");
++        name = name.replace("Goal", "");
 +        StringBuilder sb = new StringBuilder();
 +        for (char c : name.toCharArray()) {
 +            if (c >= 'A' && c <= 'Z') {