diff --git a/src/waiter.py b/src/waiter.py
index b576242..c1a5abc 100644
--- a/src/waiter.py
+++ b/src/waiter.py
@@ -13,10 +13,11 @@ class Waiter(pygame.sprite.Sprite):
 
     # Borders
     def move(self, x, y):
-        if self.matrix.walk_through(self.X + x, self.Y + y) == 1:
-            if 0 <= self.X + x < 14:
+        if 0 <= self.X + x <= 13:
+            if self.matrix.walk_through(self.X, self.Y) == 1:
                 self.X += x
-            if 0 <= self.Y + y < 15:
+        if 0 <= self.Y + y <= 14:
+            if self.matrix.walk_through(self.X, self.Y) == 1:
                 self.Y += y
 
     def update(self, event):