diff --git a/UEFIFind/uefifind.cpp b/UEFIFind/uefifind.cpp
index 97b374c..e0583f6 100644
--- a/UEFIFind/uefifind.cpp
+++ b/UEFIFind/uefifind.cpp
@@ -79,7 +79,7 @@ USTATUS UEFIFind::find(const UINT8 mode, const bool count, const QString & hexPa
 
         // Special case of freeform subtype GUID files
         if (indexes.second.isValid() && model->subtype(indexes.second) == EFI_SECTION_FREEFORM_SUBTYPE_GUID) {
-            data = model->header(indexes.second).left(sizeof(EFI_FREEFORM_SUBTYPE_GUID_SECTION));
+            data = model->header(indexes.second);
             result.append(" ").append(guidToUString(*(const EFI_GUID*)(data.constData() + sizeof(EFI_COMMON_SECTION_HEADER))));
         }
         
diff --git a/UEFIFind/uefifind_main.cpp b/UEFIFind/uefifind_main.cpp
index c55e0b2..ee29196 100644
--- a/UEFIFind/uefifind_main.cpp
+++ b/UEFIFind/uefifind_main.cpp
@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
         return U_SUCCESS;
     }
     else {
-        std::cout << "UEFIFind 0.10.8" << std::endl << std::endl <<
+        std::cout << "UEFIFind 0.10.9" << std::endl << std::endl <<
             "Usage: UEFIFind {header | body | all} {list | count} pattern imagefile" << std::endl <<
             "    or UEFIFind file patternsfile imagefile" << std::endl;
         return U_INVALID_PARAMETER;
diff --git a/common/nvramparser.cpp b/common/nvramparser.cpp
index 811088d..d468a9c 100644
--- a/common/nvramparser.cpp
+++ b/common/nvramparser.cpp
@@ -1374,7 +1374,7 @@ USTATUS NvramParser::parseVssStoreBody(const UModelIndex & index)
 
             // Check variable size
             if (variableSize > unparsedSize) {
-                unparsedSize = 0;
+                variableSize = 0;
             }
         }