diff --git a/Aircraft/Instruments-3d/zkv500/MainScreens.nas b/Aircraft/Instruments-3d/zkv500/MainScreens.nas
index 7655eb458..47afa35a3 100644
--- a/Aircraft/Instruments-3d/zkv500/MainScreens.nas
+++ b/Aircraft/Instruments-3d/zkv500/MainScreens.nas
@@ -220,11 +220,11 @@ var screenNavigationMain = {
 	    type != nil ? type.getValue() : "---"),
 	sprintf("BRG: %d°  DST: %d %s",
 	    me.waypoint.getNode("bearing-mag-deg",1).getValue(),
-	    dist * dist_conv[0][dist_unit],
+	    me.waypoint.getNode("distance-nm",1).getValue() * dist_conv[0][dist_unit],
 	    dist_unit_short_name[dist_unit]),
 	sprintf("XCRS: %d* (%.1f %s)",
 	    me.waypoint.getNode("course-deviation-deg").getValue(), 
-	    me.waypoint.getNode("course-error-nm").getValue() * dist_conv[0][dist_unit],
+	    dist * dist_conv[0][dist_unit],
 	    dist_unit_short_name[dist_unit]),
 	sprintf("TTW: %s", 
 	    me.waypoint.getNode("TTW").getValue()),