diff --git a/opm/parser/eclipse/EclipseState/Tables/OilvisctTable.hpp b/opm/parser/eclipse/EclipseState/Tables/OilvisctTable.hpp
index 3b28fc6ce..082f84678 100644
--- a/opm/parser/eclipse/EclipseState/Tables/OilvisctTable.hpp
+++ b/opm/parser/eclipse/EclipseState/Tables/OilvisctTable.hpp
@@ -25,8 +25,8 @@ namespace Opm {
     // forward declaration
     class TableManager;
 
-    class OilvisctTable : protected SimpleTable {
-        
+    class OilvisctTable : public SimpleTable {
+    public:
 
         friend class TableManager;
         OilvisctTable() = default;
@@ -50,7 +50,6 @@ namespace Opm {
             SimpleTable::checkMonotonic("Viscosity", /*isAscending=*/false, /*strictlyMonotonic=*/false);
         }
 
-    public:
         using SimpleTable::numTables;
         using SimpleTable::numRows;
         using SimpleTable::numColumns;
diff --git a/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp b/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp
index b955f33bc..07a34b4a0 100644
--- a/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp
+++ b/opm/parser/eclipse/EclipseState/Tables/TableManager.cpp
@@ -193,6 +193,9 @@ namespace Opm {
         initSimpleTableContainer<PvdgTable>(deck, "PVDG", m_tabdims->getNumPVTTables());
         initSimpleTableContainer<PvdoTable>(deck, "PVDO", m_tabdims->getNumPVTTables());
         initSimpleTableContainer<PvdsTable>(deck, "PVDS", m_tabdims->getNumPVTTables());
+        initSimpleTableContainer<OilvisctTable>(deck, "OILVISCT", m_tabdims->getNumPVTTables());
+        initSimpleTableContainer<WatvisctTable>(deck, "WATVISCT", m_tabdims->getNumPVTTables());
+
 
         /*****************************************************************/
 
@@ -200,8 +203,6 @@ namespace Opm {
         initSimpleTable(deck, "PLYADS", m_plyadsTables);
         initSimpleTable(deck, "PLYVISC", m_plyviscTables);
         initSimpleTable(deck, "PLYDHFLF", m_plydhflfTables);
-        initSimpleTable(deck, "OILVISCT", m_oilvisctTables);
-        initSimpleTable(deck, "WATVISCT", m_watvisctTables);
 
         initPlyrockTables(deck , "PLYROCK" , m_plyrockTables);
         initPlymaxTables(deck , "PLYMAX" , m_plymaxTables);
@@ -495,12 +496,12 @@ namespace Opm {
         return getTables("PVDS");
     }
 
-    const std::vector<OilvisctTable>& TableManager::getOilvisctTables() const {
-        return m_oilvisctTables;
+    const TableContainer& TableManager::getOilvisctTables() const {
+        return getTables("OILVISCT");
     }
 
-    const std::vector<WatvisctTable>& TableManager::getWatvisctTables() const {
-        return m_watvisctTables;
+    const TableContainer& TableManager::getWatvisctTables() const {
+        return getTables("WATVISCT");
     }
 
     const std::vector<GasvisctTable>& TableManager::getGasvisctTables() const {
diff --git a/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp b/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp
index 6495bce56..42a482f46 100644
--- a/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp
+++ b/opm/parser/eclipse/EclipseState/Tables/TableManager.hpp
@@ -90,6 +90,9 @@ namespace Opm {
         const TableContainer& getPvdgTables() const;
         const TableContainer& getPvdoTables() const;
         const TableContainer& getPvdsTables() const;
+        const TableContainer& getWatvisctTables() const;
+        const TableContainer& getOilvisctTables() const;
+
 
 
         // the tables used by the deck. If the tables had some defaulted data in the
@@ -104,10 +107,9 @@ namespace Opm {
         const std::vector<PlyviscTable>& getPlyviscTables() const;
         const std::vector<PlydhflfTable>& getPlydhflfTables() const;
         const std::vector<RocktabTable>& getRocktabTables() const;
-        const std::vector<WatvisctTable>& getWatvisctTables() const;
-        const std::vector<OilvisctTable>& getOilvisctTables() const;
-        const std::vector<GasvisctTable>& getGasvisctTables() const;
         const std::vector<RtempvdTable>& getRtempvdTables() const;
+        const std::vector<GasvisctTable>& getGasvisctTables() const;
+
 
         const std::map<int, VFPProdTable>& getVFPProdTables() const;
         const std::map<int, VFPInjTable>& getVFPInjTables() const;
@@ -240,10 +242,8 @@ namespace Opm {
         std::vector<PlydhflfTable> m_plydhflfTables;
         std::vector<PlyshlogTable> m_plyshlogTables;
         std::vector<RocktabTable> m_rocktabTables;
-        std::vector<WatvisctTable> m_watvisctTables;
-        std::vector<OilvisctTable> m_oilvisctTables;
-        std::vector<GasvisctTable> m_gasvisctTables;
         std::vector<RtempvdTable> m_rtempvdTables;
+        std::vector<GasvisctTable> m_gasvisctTables;
 
         std::shared_ptr<Regdims> m_regdims;
         std::shared_ptr<Tabdims> m_tabdims;
diff --git a/opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp b/opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp
index 3df30ee2a..e3f8e1b5f 100644
--- a/opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp
+++ b/opm/parser/eclipse/EclipseState/Tables/WatvisctTable.hpp
@@ -25,8 +25,8 @@ namespace Opm {
     // forward declaration
     class TableManager;
 
-    class WatvisctTable : protected SimpleTable {
-
+    class WatvisctTable : public SimpleTable {
+    public:
         friend class TableManager;
         WatvisctTable() = default;
 
@@ -49,7 +49,6 @@ namespace Opm {
             SimpleTable::checkMonotonic("Viscosity", /*isAscending=*/false, /*strictlyMonotonic=*/false);
         }
 
-    public:
         using SimpleTable::numTables;
         using SimpleTable::numRows;
         using SimpleTable::numColumns;