diff --git a/src/common/StateManager.cxx b/src/common/StateManager.cxx
index 768d4c928..66a62bf29 100644
--- a/src/common/StateManager.cxx
+++ b/src/common/StateManager.cxx
@@ -27,7 +27,7 @@
 
 #include "StateManager.hxx"
 
-#define STATE_HEADER "05010000state"
+#define STATE_HEADER "05019000state"
 // #define MOVIE_HEADER "03030000movie"
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/src/emucore/tia/PaddleReader.cxx b/src/emucore/tia/PaddleReader.cxx
index cdb6c9437..f5a036145 100644
--- a/src/emucore/tia/PaddleReader.cxx
+++ b/src/emucore/tia/PaddleReader.cxx
@@ -116,7 +116,7 @@ bool PaddleReader::save(Serializer& out) const
     out.putDouble(myU);
 
     out.putDouble(myValue);
-    out.putDouble(myTimestamp);
+    out.putLong(myTimestamp);
 
     out.putInt(int(myConsoleTiming));
     out.putDouble(myClockFreq);
@@ -144,7 +144,7 @@ bool PaddleReader::load(Serializer& in)
     myU = in.getDouble();
 
     myValue = in.getDouble();
-    myTimestamp = in.getDouble();
+    myTimestamp = in.getLong();
 
     myConsoleTiming = ConsoleTiming(in.getInt());
     myClockFreq = in.getDouble();
diff --git a/src/emucore/tia/TIA.cxx b/src/emucore/tia/TIA.cxx
index 543a51be3..5babe0e7d 100644
--- a/src/emucore/tia/TIA.cxx
+++ b/src/emucore/tia/TIA.cxx
@@ -273,7 +273,7 @@ bool TIA::save(Serializer& out) const
 
     out.putByte(myColorHBlank);
 
-    out.putDouble(myTimestamp);
+    out.putLong(myTimestamp);
 
     out.putBool(myAutoFrameEnabled);
 
@@ -344,7 +344,7 @@ bool TIA::load(Serializer& in)
 
     myColorHBlank = in.getByte();
 
-    myTimestamp = in.getDouble();
+    myTimestamp = in.getLong();
 
     myAutoFrameEnabled = in.getBool();