diff --git a/README.md b/README.md
index 11e62a0f..9c57d398 100644
--- a/README.md
+++ b/README.md
@@ -47,10 +47,14 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### Rolling (2021-08-30)
+##### Rolling (2021-08-31)
 
-* dedicated NaN-test case
-* based on v8.2.0
+* Bug fix
+
+Rolling (2021-08-30)
+
+* Dedicated NaN-test case
+* Based on v8.2.0
 
 ##### 8.2.0 - Multi Meter Support (2021-08-24)
 
diff --git a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp
index 138a85e7..a54eb74c 100644
--- a/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp
+++ b/code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp
@@ -402,8 +402,6 @@ bool ClassFlowPostProcessing::ReadParameter(FILE* pfile, string& aktparamgraph)
 
 void ClassFlowPostProcessing::InitNUMBERS()
 {
-//    ClassFlowDigit* _cdigit = NULL;
-//    ClassFlowAnalog* _canalog = NULL;
     int anzDIGIT = 0;
     int anzANALOG = 0;
     std::vector<std::string> name_numbers;
@@ -572,9 +570,9 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
 ///////////////// SPEZIALFALL für User Gustl ///////////////////////////////////////////////////////
         if (IgnoreLeadingNaN)               
         {
-            while ((NUMBERS[j]->ReturnValue.length() > 1) && (NUMBERS[j]->ReturnValue[0] == 'N'))
+            while ((NUMBERS[j]->ReturnRawValue.length() > 1) && (NUMBERS[j]->ReturnRawValue[0] == 'N'))
             {
-                NUMBERS[j]->ReturnValue.erase(0, 1);
+                NUMBERS[j]->ReturnRawValue.erase(0, 1);
             }
         } 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/code/main/version.cpp b/code/main/version.cpp
index 978341da..36f0d6a7 100644
--- a/code/main/version.cpp
+++ b/code/main/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="eb02e0a";
+const char* GIT_REV="b7b7029";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-08-30 21:07";
\ No newline at end of file
+const char* BUILD_TIME="2021-08-31 11:37";
\ No newline at end of file
diff --git a/code/version.cpp b/code/version.cpp
index 978341da..36f0d6a7 100644
--- a/code/version.cpp
+++ b/code/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="eb02e0a";
+const char* GIT_REV="b7b7029";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-08-30 21:07";
\ No newline at end of file
+const char* BUILD_TIME="2021-08-31 11:37";
\ No newline at end of file
diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin
index 728a889c..ecb056ce 100644
Binary files a/firmware/bootloader.bin and b/firmware/bootloader.bin differ
diff --git a/firmware/firmware.bin b/firmware/firmware.bin
index 6f7d49e5..4fdfb857 100644
Binary files a/firmware/firmware.bin and b/firmware/firmware.bin differ