diff --git a/apps/compass/ChangeLog b/apps/compass/ChangeLog
index d1adafc4c..deb1072f5 100644
--- a/apps/compass/ChangeLog
+++ b/apps/compass/ChangeLog
@@ -4,3 +4,4 @@
 0.04: Fix for Bangle.js 2 and themes
 0.05: Fix bearing not clearing correctly (visible in single or double digit bearings)
 0.06: Add button for force compass calibration
+0.07: Use 360-heading to output the correct heading value (fix #1866)
diff --git a/apps/compass/compass.js b/apps/compass/compass.js
index 4730111ac..dd398ffa6 100644
--- a/apps/compass/compass.js
+++ b/apps/compass/compass.js
@@ -34,7 +34,7 @@ var oldHeading = 0;
 Bangle.on('mag', function(m) {
   if (!Bangle.isLCDOn()) return;
   g.reset();
-  if (isNaN(m.heading)) {
+  if (isNaN(m.heading)) {    
     if (!wasUncalibrated) {
       g.clearRect(0,24,W,48);
       g.setFontAlign(0,-1).setFont("6x8");
@@ -49,7 +49,7 @@ Bangle.on('mag', function(m) {
     g.setFontAlign(0,0).setFont("6x8",3);
     var y = 36;
     g.clearRect(M-40,24,M+40,48);
-    g.drawString(Math.round(m.heading),M,y,true);
+    g.drawString(Math.round(360-m.heading),M,y,true);
   }
 
 
diff --git a/apps/compass/metadata.json b/apps/compass/metadata.json
index 3e3b37f72..a3995a123 100644
--- a/apps/compass/metadata.json
+++ b/apps/compass/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "compass",
   "name": "Compass",
-  "version": "0.06",
+  "version": "0.07",
   "description": "Simple compass that points North",
   "icon": "compass.png",
   "screenshots": [{"url":"screenshot_compass.png"}],