diff --git a/UEFIExtract/ffsdumper.cpp b/UEFIExtract/ffsdumper.cpp
index 14c021f..d02efb0 100644
--- a/UEFIExtract/ffsdumper.cpp
+++ b/UEFIExtract/ffsdumper.cpp
@@ -85,7 +85,11 @@ STATUS FfsDumper::recursiveDump(const QModelIndex & index, const QString & path,
     UINT8 result;
     for (int i = 0; i < model->rowCount(index); i++) {
         QModelIndex childIndex = index.child(i, 0);
-        QString childPath = QString("%1/%2 %3").arg(path).arg(i).arg(model->text(childIndex).isEmpty() ? model->name(childIndex) : model->text(childIndex));
+        bool useText = FALSE;
+        if (model->type(childIndex) != Types::Volume)
+            useText = !model->text(childIndex).isEmpty();
+
+        QString childPath = QString("%1/%2 %3").arg(path).arg(i).arg(useText ? model->text(childIndex) : model->name(childIndex));
         result = recursiveDump(childIndex, childPath, guid);
         if (result)
             return result;
diff --git a/common/parsingdata.h b/common/parsingdata.h
index 818891f..18de92f 100644
--- a/common/parsingdata.h
+++ b/common/parsingdata.h
@@ -1,4 +1,4 @@
-/* ffsparser.h
+/* parsingdata.h
 
 Copyright (c) 2015, Nikolaj Schlej. All rights reserved.
 This program and the accompanying materials
@@ -9,7 +9,6 @@ http://opensource.org/licenses/bsd-license.php
 THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
 WITHWARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
-
 Parsing data is an information needed for each level of image reconstruction
 routines without the need of backward traversal