diff --git a/qml/Ping360Visualizer.qml b/qml/Ping360Visualizer.qml
index 66e975e8c..9a7c61dc2 100644
--- a/qml/Ping360Visualizer.qml
+++ b/qml/Ping360Visualizer.qml
@@ -28,14 +28,15 @@ Item {
       */
 
     Timer {
-        interval: 50
+        interval: 5
         running: true
         repeat: true
         onTriggered: {
             shapeSpinner.angle = (ping.angle + 0.25)*180/200
+            /*
             if(chart.visible) {
                 chart.draw(ping.data, ping.range, 0)
-            }
+            }*/
         }
     }
 
diff --git a/src/sensor/ping360.h b/src/sensor/ping360.h
index f0eb26a46..d44935c33 100644
--- a/src/sensor/ping360.h
+++ b/src/sensor/ping360.h
@@ -151,7 +151,7 @@ class Ping360 : public PingSensor {
      *
      * @return uint16_t
      */
-    uint16_t angle() { return (_angle + angle_offset()) % _angularResolutionGrad; }
+    uint16_t angle() { return (_angle + angle_offset() + static_cast<int>(_heading)) % _angularResolutionGrad; }
     Q_PROPERTY(int angle READ angle NOTIFY angleChanged)
 
     /**
diff --git a/src/waterfall/polarplot.cpp b/src/waterfall/polarplot.cpp
index 5da432177..164ca6266 100644
--- a/src/waterfall/polarplot.cpp
+++ b/src/waterfall/polarplot.cpp
@@ -73,6 +73,9 @@ void PolarPlot::draw(
     }
 
     // TODO: Need a better way to deal with dynamic steps, maybe doing `draw(data, angle++)` with `angleGrad` loop
+    while(angle < 0) {
+        angle += maxGradian;
+    }
     _distances[static_cast<int>(angle) % _angularResolution] = initPoint + length;
 
     float maxDistance = 0;