diff --git a/openweather.js b/openweather.js
index 2d98b11..976adaa 100644
--- a/openweather.js
+++ b/openweather.js
@@ -257,7 +257,7 @@ function convertUnits(units, value) {
     } else if ( units === 'm' ) {
         skUnits = "m"
     }
-    return { value, units: skUnits }
+    return { value: value, units: skUnits }
 }
 
 function onElevationUpdate(value) {
@@ -266,7 +266,7 @@ function onElevationUpdate(value) {
         log("Cannot add null value as elevation - using 0 instead");
         latest.altitude.elevation = 0
     }
-    else
+    else if (value!=="waiting ...")
     {
         latest.altitude.elevation = value
         log("Elevation set to "+value+"m above sea level");
diff --git a/package-lock.json b/package-lock.json
index fca3a7f..1d70130 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "openweather-signalk",
-  "version": "0.1.0",
+  "version": "0.3.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a2a5779..7b8fd09 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "openweather-signalk",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "SignalK plugin to provide data from OpenWeather Service",
   "main": "index.js",
   "scripts": {