CB-805 getCurrentHeading returns success only once
diff --git a/templates/standalone/cordovalib/Commands/Compass.cs b/templates/standalone/cordovalib/Commands/Compass.cs
index 7129438..9f8d402 100644
--- a/templates/standalone/cordovalib/Commands/Compass.cs
+++ b/templates/standalone/cordovalib/Commands/Compass.cs
@@ -165,7 +165,6 @@
             {
                 if (currentStatus != Running)
                 {
-
                     lock (compass)
                     {
                         compass.CurrentValueChanged += compass_SingleHeadingValueChanged;
@@ -188,11 +187,11 @@
                 }
                 lock (compass)
                 {
-
                     compass.CurrentValueChanged -= compass_SingleHeadingValueChanged;
                     if (watchers.Count < 1)
                     {
                         compass.Stop();
+                        this.SetStatus(Stopped);
                     }
                 }
             }