diff --git a/src/ui/HSIDisplay.cc b/src/ui/HSIDisplay.cc
index 0e46b297ed5b0344121d8255a9a888fc8d2535dc..cce397a39a962c34986a2e0e14d804e5165448ed 100644
--- a/src/ui/HSIDisplay.cc
+++ b/src/ui/HSIDisplay.cc
@@ -1313,7 +1313,7 @@ void HSIDisplay::drawWaypoint(QPainter& painter, const QColor& color, float widt
 
     float radius = (waypointSize/2.0f) * 0.8 * (1/sqrt(2.0f));
     float acceptRadius = w->getAcceptanceRadius();
-    double yawDiff = w->yaw()/180.0*M_PI-yaw;
+    double yawDiff = w->yawRadians()/180.0*M_PI-yaw;
 
     // Draw background
     pen.setColor(Qt::black);
diff --git a/src/ui/map/QGCMapWidget.cc b/src/ui/map/QGCMapWidget.cc
index 58659c175cefb10dce7b3a925f7d58e755b1b113..e7c29365a6bfc3e309674db49d9b2a40c3cbba96 100644
--- a/src/ui/map/QGCMapWidget.cc
+++ b/src/ui/map/QGCMapWidget.cc
@@ -750,7 +750,7 @@ void QGCMapWidget::updateWaypoint(int uas, MissionItem* wp)
                     // Use safe standard interfaces for non MissionItem-class based wps
                     icon->SetCoord(internals::PointLatLng(wp->latitude(), wp->longitude()));
                     icon->SetAltitude(wp->altitude());
-                    icon->SetHeading(wp->yaw());
+                    icon->SetHeading(wp->yawRadians());
                     icon->SetNumber(wpindex);
                 }
                 // Re-enable signals again
diff --git a/src/ui/map/Waypoint2DIcon.cc b/src/ui/map/Waypoint2DIcon.cc
index 29f6809f644c091b247eaa4b798e9f39a7ce155a..28262b16327ed9d5259640c89a8f531ccca6efaa 100644
--- a/src/ui/map/Waypoint2DIcon.cc
+++ b/src/ui/map/Waypoint2DIcon.cc
@@ -33,7 +33,7 @@ Waypoint2DIcon::Waypoint2DIcon(mapcontrol::MapGraphicItem* map, mapcontrol::OPMa
     showOrbit(false),
     color(color)
 {
-    SetHeading(wp->yaw());
+    SetHeading(wp->yawRadians());
     SetNumber(listindex);
     this->setFlag(QGraphicsItem::ItemIgnoresTransformations,true);
     picture = QPixmap(radius+1, radius+1);
@@ -59,7 +59,7 @@ void Waypoint2DIcon::updateWaypoint()
         // Store old size
         static QRectF oldSize;
 
-        SetHeading(waypoint->yaw());
+        SetHeading(waypoint->yawRadians());
         SetCoord(internals::PointLatLng(waypoint->latitude(), waypoint->longitude()));
 
         // qDebug() << "UPDATING WP:" << waypoint->sequenceNumber() << "LAT:" << waypoint->latitude() << "LON:" << waypoint->longitude();