diff --git a/main/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java b/main/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java
index 95d907143..3e69fea08 100644
--- a/main/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java
+++ b/main/src/main/java/net/citizensnpcs/trait/waypoint/WanderWaypointProvider.java
@@ -313,8 +313,8 @@ public void onRemove() {
     public void onSpawn(NPC npc) {
         this.npc = npc;
         if (currentGoal == null) {
-            currentGoal = WanderGoal.createWithNPCAndRangeAndTreeAndFallbackAndRegion(npc, xrange, yrange,
-                    WanderWaypointProvider.this, WanderWaypointProvider.this, getWorldGuardRegion());
+            currentGoal = WanderGoal.builder(npc).xrange(xrange).yrange(yrange).fallback(this).tree(this)
+                    .worldguardRegion(getWorldGuardRegion()).build();
             currentGoal.setDelay(delay);
         }
         Iterator<GoalEntry> itr = npc.getDefaultGoalController().iterator();