diff --git a/README.md b/README.md
index 04e093e02b..bb32ee30d0 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
 # AndroidAPS
-
 * Check the wiki: https://androidaps.readthedocs.io
 *  Everyone who’s been looping with AndroidAPS needs to fill out the form after 3 days of looping  https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt
index 33f0c361e5..db01f9d7c0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/source/MM640gPlugin.kt
@@ -75,7 +75,7 @@ class MM640gPlugin @Inject constructor(
                             when (val type = jsonObject.getString("type")) {
                                 "sgv" ->
                                     glucoseValues += CgmSourceTransaction.TransactionGlucoseValue(
-                                        timestamp = jsonObject.getLong("sgv"),
+                                        timestamp = jsonObject.getLong("date"),
                                         value = jsonObject.getDouble("sgv"),
                                         raw = jsonObject.getDouble("sgv"),
                                         noise = null,
diff --git a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt
index f6b0a81b70..6be6a5ad2e 100644
--- a/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt
+++ b/app/src/main/java/info/nightscout/androidaps/receivers/DataReceiver.kt
@@ -55,12 +55,8 @@ open class DataReceiver : DaggerBroadcastReceiver() {
             Intents.NS_EMULATOR                       ->
                 OneTimeWorkRequest.Builder(MM640gPlugin.MM640gWorker::class.java)
                     .setInputData(Data.Builder().also {
-                        it.copyDouble(Intents.EXTRA_BG_ESTIMATE, bundle)
-                        it.copyString(Intents.EXTRA_BG_SLOPE_NAME, bundle)
-                        it.copyLong(Intents.EXTRA_TIMESTAMP, bundle)
-                        it.copyDouble(Intents.EXTRA_RAW, bundle)
-                        it.copyInt(Intents.EXTRA_SENSOR_BATTERY, bundle, -1)
-                        it.copyString(Intents.XDRIP_DATA_SOURCE_DESCRIPTION, bundle)
+                        it.copyString("collection", bundle)
+                        it.copyString("data", bundle)
                     }.build()).build()
             Telephony.Sms.Intents.SMS_RECEIVED_ACTION ->
                 OneTimeWorkRequest.Builder(SmsCommunicatorPlugin.SmsCommunicatorWorker::class.java)