diff --git a/app/release/app-release-3.6.2b.apk b/app/release/app-release-3.6.2b.apk
new file mode 100644
index 0000000..6682b4e
Binary files /dev/null and b/app/release/app-release-3.6.2b.apk differ
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index 27196ba..6682b4e 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/app-release-3.6.2a.apk b/app/release/old_versions/app-release-3.6.2a.apk
similarity index 100%
rename from app/release/app-release-3.6.2a.apk
rename to app/release/old_versions/app-release-3.6.2a.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 0fa72f6..64a92b9 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -10,8 +10,8 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 83,
-      "versionName": "3.6.2a",
+      "versionCode": 84,
+      "versionName": "3.6.2b",
       "outputFile": "app-release.apk"
     }
   ]
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
index af4f07f..d0d4c1c 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
@@ -393,10 +393,6 @@ public class SdServer extends Service implements SdDataReceiver {
 
 
         try {
-            // Cancel the notification.
-            Log.v(TAG, "onDestroy(): cancelling notification");
-            mUtil.writeToSysLogFile("SdServer.onDestroy - cancelling notification");
-            mNM.cancel(NOTIFICATION_ID);
             // Stop web server
             Log.v(TAG, "onDestroy(): stopping web server");
             mUtil.writeToSysLogFile("SdServer.onDestroy() - stopping Web Server");
@@ -406,6 +402,12 @@ public class SdServer extends Service implements SdDataReceiver {
             mToneGenerator.release();
             mToneGenerator = null;
 
+            this.stopForeground(true);
+            // Cancel the notification.
+            Log.v(TAG, "onDestroy(): cancelling notification");
+            mUtil.writeToSysLogFile("SdServer.onDestroy - cancelling notification");
+            mNM.cancel(NOTIFICATION_ID);
+
             // stop this service.
             Log.v(TAG, "onDestroy(): calling stopSelf()");
             mUtil.writeToSysLogFile("SdServer.onDestroy() - stopping self");