diff --git a/src/emucore/tia/FrameManager.cxx b/src/emucore/tia/FrameManager.cxx
index 885740de4..abf44495f 100644
--- a/src/emucore/tia/FrameManager.cxx
+++ b/src/emucore/tia/FrameManager.cxx
@@ -326,7 +326,7 @@ void FrameManager::setFixedHeight(uInt32 height)
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 uInt32 FrameManager::scanlines() const
 {
-  return myState == State::frame ? myCurrentFrameTotalLines : myCurrentFrameFinalLines;
+  return  myCurrentFrameTotalLines;
 }
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/emucore/tia/TIA.cxx b/src/emucore/tia/TIA.cxx
index cf2cea18c..874d9ee9c 100644
--- a/src/emucore/tia/TIA.cxx
+++ b/src/emucore/tia/TIA.cxx
@@ -690,7 +690,7 @@ bool TIA::scanlinePos(uInt16& x, uInt16& y) const
     if(1)//myFramePointerClocks >= myFramePointerOffset)
     {
       x = clocksThisLine();//(myFramePointerClocks - myFramePointerOffset) % 160;
-      y = scanlines();//(myFramePointerClocks - myFramePointerOffset) / 160;
+      y = myFrameManager.getY();//(myFramePointerClocks - myFramePointerOffset) / 160;
       return true;
     }
     else