diff --git a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
index 7d318220..5e0c6ee5 100644
--- a/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
+++ b/src/main/java/net/Indyuce/mmocore/api/player/PlayerData.java
@@ -467,7 +467,8 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
          */
         setLastActivity(PlayerActivity.USE_WAYPOINT);
 
-        giveStellium(-waypoint.getCost(costType), PlayerResourceUpdateEvent.UpdateReason.USE_WAYPOINT);
+        final double cost = waypoint.getCost(costType);
+        giveStellium(-cost, PlayerResourceUpdateEvent.UpdateReason.USE_WAYPOINT);
 
         new BukkitRunnable() {
             final int x = getPlayer().getLocation().getBlockX();
@@ -482,7 +483,7 @@ public class PlayerData extends OfflinePlayerData implements Closable, Experienc
                         || getPlayer().getLocation().getBlockZ() != z) {
                     MMOCore.plugin.soundManager.getSound(SoundEvent.WARP_CANCELLED).playTo(getPlayer());
                     MMOCore.plugin.configManager.getSimpleMessage("warping-canceled").send(getPlayer());
-                    giveStellium(waypoint.getCost(CostType.NORMAL_USE), PlayerResourceUpdateEvent.UpdateReason.SKILL_REGENERATION);
+                    giveStellium(cost, PlayerResourceUpdateEvent.UpdateReason.USE_WAYPOINT);
                     cancel();
                     return;
                 }
diff --git a/src/main/java/net/Indyuce/mmocore/waypoint/WaypointOption.java b/src/main/java/net/Indyuce/mmocore/waypoint/WaypointOption.java
index 65a3b582..d9f626d5 100644
--- a/src/main/java/net/Indyuce/mmocore/waypoint/WaypointOption.java
+++ b/src/main/java/net/Indyuce/mmocore/waypoint/WaypointOption.java
@@ -17,7 +17,8 @@ public enum WaypointOption {
     ENABLE_MENU(true),
 
     /**
-     * By defaut, players must stand into
+     * By default waypoints are not dynamic. Players need to be standing on
+     * ANOTHER waypoint to be able to teleport to other waypoints.
      */
     DYNAMIC(false),