diff --git a/apps/kitchen/compass.kit.js b/apps/kitchen/compass.kit.js
index d5299b545..f8b2c9393 100644
--- a/apps/kitchen/compass.kit.js
+++ b/apps/kitchen/compass.kit.js
@@ -106,6 +106,7 @@
     }
 
     function onButtonShort(btn) {
+      log_debug("onButtonShort()");
       if (gpsObject.getState() !== gpsObject.GPS_RUNNING) return;
       switch(btn) {
       case 1:
@@ -129,7 +130,6 @@
       log_debug("markWaypoint()");
       if (btn !== 1) return;
       if (gpsObject.getState() !== gpsObject.GPS_RUNNING) return;
-
       log_debug("markWaypoint()");
       
       gpsObject.markWaypoint();
@@ -144,8 +144,8 @@
       wp_distance = gpsObject.getWPdistance();
       wp_bearing = gpsObject.getWPbearing();
       log_debug(wp);
-      log_debug(wp_distance);
-      log_debug(wp_bearing);
+      log_debug("wp_distance:" + wp_distance);
+      log_debug("wp_bearing:" + wp_bearing);
     }
     
     // takes 32ms
@@ -206,16 +206,8 @@
       var d = tiltfixread(CALIBDATA.offset,CALIBDATA.scale);
       heading = newHeading(d,heading);
 
-      if (gpsObject.getState() === gpsObject.GPS_RUNNING) {
-        wp_dist = gpsObject.getWPdistance();
-        wp_bearing = gpsObject.getWPbearing();
-        bearing = wp_bearing;
-      } else {
-        bearing = 0;
-        wp_distance = 0;
-        wp_bearing = 0;
-      }
-
+      getWaypoint();
+      
       var dir = bearing - heading;
       if (dir < 0) dir += 360;
       if (dir > 360) dir -= 360;