diff --git a/changelog.txt b/changelog.txt
index b69d9fd4..d268afa1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,5 @@
 ---version 2.0.4 yet to be released---
+14-mar-2009 - adelikat - Fix major crash issue where NROM game savestates were writing erroneous information if a non NROM game was loaded prior
 13-mar-2009 - adelikat - Closing game / Opening new game resets the frame counter
 13-mar-2009 - adelikat - Win32 - Debugger - Scanlines and PPU Pixels are displayed even in vblank (lines 240-261)
 12-mar-2009 - shinydoofy - sdl - fixed compilation error and reactivated the mouse pointer in the SDL window
diff --git a/src/state.cpp b/src/state.cpp
index 1d8b611a..14bde163 100644
--- a/src/state.cpp
+++ b/src/state.cpp
@@ -743,6 +743,9 @@ void ResetExState(void (*PreSave)(void), void (*PostSave)(void))
 		if(SFMDATA[x].desc)
 			free(SFMDATA[x].desc);
 	}
+	// adelikat, 3/14/09:  had to add this to clear out the size parameter.  NROM(mapper 0) games were having savestate crashes if loaded after a non NROM game	because the size variable was carrying over and causing savestates to save too much data
+	SFMDATA[0].s = 0;		
+	
 	SPreSave = PreSave;
 	SPostSave = PostSave;
 	SFEXINDEX=0;