diff --git a/src/dynamicMesh/meshSubsetHelper/meshSubsetHelper.C b/src/dynamicMesh/meshSubsetHelper/meshSubsetHelper.C
index 2e55e4a0ea..5a2f24de30 100644
--- a/src/dynamicMesh/meshSubsetHelper/meshSubsetHelper.C
+++ b/src/dynamicMesh/meshSubsetHelper/meshSubsetHelper.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -72,8 +72,10 @@ void Foam::meshSubsetHelper::correct(bool verbose)
             Info<< "Subsetting mesh based on cellSet " << name_ << endl;
         }
 
-        cellSet subset(baseMesh_, name_);
-        subsetter_.setLargeCellSubset(subset);
+        subsetter_.setLargeCellSubset
+        (
+            cellSet(baseMesh_, name_)
+        );
     }
     else if (type_ == ZONE)
     {
diff --git a/src/dynamicMesh/meshSubsetHelper/meshSubsetHelper.H b/src/dynamicMesh/meshSubsetHelper/meshSubsetHelper.H
index 0244d098e3..15914ff8c1 100644
--- a/src/dynamicMesh/meshSubsetHelper/meshSubsetHelper.H
+++ b/src/dynamicMesh/meshSubsetHelper/meshSubsetHelper.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,7 +59,7 @@ public:
         //- Internal book-keeping for subset type
         enum subsetType
         {
-            NONE,       //<! Not a subset
+            NONE = 0,   //<! Not a subset
             SET,        //<! Using a cellSet for the subset
             ZONE        //<! Using a cellZone for the subset
         };
@@ -134,10 +134,14 @@ public:
             {
                 return subsetter_.subMesh();
             }
-            else
-            {
-                return baseMesh_;
-            }
+
+            return baseMesh_;
+        }
+
+        //- The associated (set or zone) name if any.
+        inline const word& name() const
+        {
+            return name_;
         }