diff --git a/calcs/cpa_tcpa.js b/calcs/cpa_tcpa.js
index 3211968..f96a8fb 100755
--- a/calcs/cpa_tcpa.js
+++ b/calcs/cpa_tcpa.js
@@ -129,7 +129,6 @@ module.exports = function (app, plugin) {
           )
           
           if (
-            typeof plugin.properties.traffic.distanceToSelf === 'undefined' ||
             plugin.properties.traffic.distanceToSelf
          ) {
             app.debug('distance of ' + vessel + ' to self: ' + distance)
@@ -139,20 +138,9 @@ module.exports = function (app, plugin) {
                 {
                   values: [
                     {
-                      path: 'distanceToSelf',
+                      path: 'navigation.distanceToSelf',
                       value: distance
                     }
-                  ],
-                  meta: [
-                    {
-                      path: 'distanceToSelf',
-                      value: {
-                        units: "m",
-                        description: "distance to own vessel",
-                        displayName: "Distance to self",
-                        shortName: "Distance"
-                      }
-                    }
                   ]
                 }
               ]