diff --git a/pokemongo_bot/step_walker.py b/pokemongo_bot/step_walker.py
index e0fb64bf00..378c31fd43 100644
--- a/pokemongo_bot/step_walker.py
+++ b/pokemongo_bot/step_walker.py
@@ -25,7 +25,7 @@ def __init__(self, bot, speed, initLat, initLng, destLat, destLng):
 
         self.steps = (dist + 0.0) / (speed + 0.0)
 
-        if dist < 0.01 or self.steps < 1:
+        if dist < speed or self.steps < 1:
             self.dLat = 0
             self.dLng = 0
             self.magnitude = 0;
@@ -44,7 +44,8 @@ def step(self):
         # print 'distance'
         # print dist
 
-        if (self.dLat == 0 and self.dLng == 0) or dist < 15:
+        if (self.dLat == 0 and self.dLng == 0) or dist < self.speed:
+            self.api.set_position(self.destLat, self.destLng, 0)
             return True
 
         totalDLat = (self.destLat - i2f(self.api._position_lat))