diff --git a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp
index 3b0f7283ee..2a1bb6aaa4 100644
--- a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp
+++ b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.cpp
@@ -38,7 +38,8 @@ RigTimeHistoryResultAccessor::RigTimeHistoryResultAccessor(RigCaseData* eclipseC
       m_porosityModel(porosityModel)
 {
     m_face = cvf::StructGridInterface::NO_FACE;
-    m_nncIndex = cvf::UNDEFINED_SIZE_T;
+
+    computeTimeHistoryData();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -47,28 +48,22 @@ RigTimeHistoryResultAccessor::RigTimeHistoryResultAccessor(RigCaseData* eclipseC
 void RigTimeHistoryResultAccessor::setFace(cvf::StructGridInterface::FaceType face)
 {
     m_face = face;
+
+    computeTimeHistoryData();
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RigTimeHistoryResultAccessor::setNncIndex(size_t nncIndex)
+std::vector<double> RigTimeHistoryResultAccessor::timeHistoryValues() const
 {
-    m_nncIndex = nncIndex;
+    return m_timeHistoryValues;
 }
 
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-std::vector<double> RigTimeHistoryResultAccessor::yValues() const
-{
-    return m_yValues;
-}
-
-//--------------------------------------------------------------------------------------------------
-/// 
-//--------------------------------------------------------------------------------------------------
-QString RigTimeHistoryResultAccessor::topologyText()
+QString RigTimeHistoryResultAccessor::topologyText() const
 {
     QString text;
 
@@ -99,9 +94,9 @@ QString RigTimeHistoryResultAccessor::topologyText()
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RigTimeHistoryResultAccessor::computeCurveData()
+void RigTimeHistoryResultAccessor::computeTimeHistoryData()
 {
-    if (m_yValues.size() != 0) return;
+    m_timeHistoryValues.clear();
 
     if (m_eclipseCaseData)
     {
@@ -111,7 +106,7 @@ void RigTimeHistoryResultAccessor::computeCurveData()
         {
             cvf::ref<RigResultAccessor> resultAccessor = RigResultAccessorFactory::createResultAccessor(m_eclipseCaseData, m_gridIndex, m_porosityModel, i, m_scalarResultIndex);
 
-            m_yValues.push_back(resultAccessor->cellScalar(m_cellIndex));
+            m_timeHistoryValues.push_back(resultAccessor->cellScalar(m_cellIndex));
         }
     }
 }
diff --git a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h
index 928a627741..1caacfb575 100644
--- a/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h
+++ b/ApplicationCode/ReservoirDataModel/RigTimeHistoryResultAccessor.h
@@ -29,30 +29,24 @@ class RigTimeHistoryResultAccessor
 {
 public:
     RigTimeHistoryResultAccessor(RigCaseData* eclipseCaseData, size_t gridIndex, size_t cellIndex, size_t scalarResultIndex, RifReaderInterface::PorosityModelResultType porosityModel);
-
     void setFace(cvf::StructGridInterface::FaceType face);
-    void setNncIndex(size_t nncIndex);
 
-    void    computeCurveData();
-    QString topologyText();
-
-    QString                 curveName() const;
-    std::vector<double>     yValues() const;
+    QString             topologyText() const;
+    std::vector<double> timeHistoryValues() const;
 
 private:
-
+    void                computeTimeHistoryData();
 
 private:
-    RigCaseData* m_eclipseCaseData;
+    RigCaseData*    m_eclipseCaseData;
 
     size_t          m_gridIndex;
     size_t          m_cellIndex;
-    size_t          m_nncIndex;
     size_t          m_scalarResultIndex;
 
     cvf::StructGridInterface::FaceType m_face;
     RifReaderInterface::PorosityModelResultType m_porosityModel;
 
-    std::vector<double> m_yValues;
+    std::vector<double> m_timeHistoryValues;
 };
 
diff --git a/ApplicationCode/UserInterface/RiuViewerCommands.cpp b/ApplicationCode/UserInterface/RiuViewerCommands.cpp
index bb651890d3..4631782a85 100644
--- a/ApplicationCode/UserInterface/RiuViewerCommands.cpp
+++ b/ApplicationCode/UserInterface/RiuViewerCommands.cpp
@@ -540,7 +540,7 @@ void RiuViewerCommands::addTimeHistoryCurve(RimEclipseView* eclipseView, size_t
     std::vector<QDateTime> timeStepDates = eclipseView->eclipseCase()->reservoirData()->results(porosityModel)->timeStepDates(eclipseView->cellResult()->scalarResultIndex());
 
     RigTimeHistoryResultAccessor timeHistResultAccessor(eclipseView->eclipseCase()->reservoirData(), gridIndex, cellIndex, eclipseView->cellResult()->scalarResultIndex(), porosityModel);
-    timeHistResultAccessor.computeCurveData();
+    timeHistResultAccessor.computeTimeHistoryData();
 
     QString curveName = eclipseView->eclipseCase()->caseUserDescription();
     curveName += " - Result : ";
@@ -548,7 +548,7 @@ void RiuViewerCommands::addTimeHistoryCurve(RimEclipseView* eclipseView, size_t
     curveName += " - ";
     curveName += timeHistResultAccessor.topologyText();
 
-    std::vector<double> yValues = timeHistResultAccessor.yValues();
+    std::vector<double> yValues = timeHistResultAccessor.timeHistoryValues();
 
     CVF_ASSERT(timeStepDates.size() == yValues.size());