diff --git a/apps/bikespeedo/ChangeLog b/apps/bikespeedo/ChangeLog
index 7330eb937..e63622217 100644
--- a/apps/bikespeedo/ChangeLog
+++ b/apps/bikespeedo/ChangeLog
@@ -1,7 +1,8 @@
-0.01: New App!
-0.02: Barometer altitude adjustment setting
-0.03: Use default Bangle formatter for booleans
-0.04: Add options for units in locale and recording GPS
-0.05: Allow toggling of "max" values (screen tap) and recording (button press)
-0.06: Fix local unit setting
+0.01: New App!
+0.02: Barometer altitude adjustment setting
+0.03: Use default Bangle formatter for booleans
+0.04: Add options for units in locale and recording GPS
+0.05: Allow toggling of "max" values (screen tap) and recording (button press)
+0.06: Fix local unit setting
 0.07: Minor code improvements
+0.08: Ensure graphics state is reset at the start of a draw (such as if a widget has altered state)
diff --git a/apps/bikespeedo/app.js b/apps/bikespeedo/app.js
index a1f0b53ce..7d0c65ab1 100644
--- a/apps/bikespeedo/app.js
+++ b/apps/bikespeedo/app.js
@@ -196,7 +196,7 @@ var emulator = (process.env.BOARD=="EMSCRIPTEN" || process.env.BOARD=="EMSCRIPTE
 var SATinView = 0;
 
 function drawFix(dat) {
-  g.clearRect(0,screenYstart,screenW,screenH);
+  g.reset().clearRect(0,screenYstart,screenW,screenH);
 
   var v = '';
   var u='';
@@ -234,7 +234,6 @@ function drawFix(dat) {
       drawSats('View:' + SATinView);
     }
   }
-  g.reset();
 }
 
 
@@ -404,12 +403,12 @@ function onGPS(fix) {
 }
 
 function updateClock() {
-  drawTime();
   g.reset();
+  drawTime();
 
   if ( emulator ) {
     max.spd++; max.alt++;
-    const d=new Date(); 
+    const d=new Date();
     sec=d.getSeconds();
     onGPS(lf);
   }
@@ -499,7 +498,7 @@ function nextMode() {
 
 function start() {
   Bangle.setBarometerPower(1); // needs some time...
-  g.clearRect(0,screenYstart,screenW,screenH);
+  g.reset().clearRect(0,screenYstart,screenW,screenH);
   onGPS(lf);
   Bangle.setGPSPower(1);
   Bangle.on('GPS', onGPS);
diff --git a/apps/bikespeedo/metadata.json b/apps/bikespeedo/metadata.json
index 20c7d4f53..2df77ec17 100644
--- a/apps/bikespeedo/metadata.json
+++ b/apps/bikespeedo/metadata.json
@@ -2,7 +2,7 @@
   "id": "bikespeedo",
   "name": "Bike Speedometer (beta)",
   "shortName": "Bike Speedometer",
-  "version": "0.07",
+  "version": "0.08",
   "description": "Shows GPS speed, GPS heading, Compass heading, GPS altitude and Barometer altitude from internal sources",
   "icon": "app.png",
   "screenshots": [{"url":"Screenshot.png"}],