diff --git a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
index c924c8c89..de931ad28 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableBase.H
@@ -112,7 +112,6 @@ protected:
 
     // Protected Member Functions
 
-
         //- Return (demand driven) interpolator
         const interpolationWeights& interpolator() const;
 
diff --git a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
index 0289025c0..37fc55416 100644
--- a/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
+++ b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -43,10 +43,13 @@ namespace Foam
     makeDataEntry(label);
     makeDataEntryType(CompatibilityConstant, label);
     makeDataEntryType(Constant, label);
-    //makeDataEntryType(PolynomialEntry, label);
-    makeDataEntryType(CSV, label);
-    makeDataEntryType(Table, label);
-    makeDataEntryType(TableFile, label);
+
+    // Polynomial functions and interpolation do evaluate to label
+    // Instead evaluate a scalar and convert to label as appropriate
+    // makeDataEntryType(PolynomialEntry, label);
+    // makeDataEntryType(CSV, label);
+    // makeDataEntryType(Table, label);
+    // makeDataEntryType(TableFile, label);
 
     makeDataEntry(scalar);
     makeDataEntryType(CompatibilityConstant, scalar);