diff --git a/src/main.rs b/src/main.rs
index 317e5c2..be2c6f6 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -23,7 +23,7 @@ mod world;
 
 /// Check if the robot is in the map.
 fn check_map(r: &robot::Robot, w: &world::World) -> Result<(), String> {
-    if (r.p.x, r.p.y) < (0, 0) || (r.p.x, r.p.y) > (w.x, w.y) {
+    if r.p.x < 0 || r.p.y < 0 || r.p.x > w.x || r.p.y > w.y {
         Err(format!("The robot {} is off map", r.id))
     } else {
         Ok(())
@@ -254,10 +254,10 @@ mod tests {
         let mut r = robot::Robot::new(
             0,
             robot::Orientation::N,
-            robot::Position { x: 2, y: 3 },
+            robot::Position { x: 2, y: 4 },
             vec!['F'],
         );
-        let w = world::World { x: 1, y: 1 };
+        let w = world::World { x: 3, y: 3 };
 
         assert!(check_map(&r, &w).is_ok());
     }