diff --git a/changelog.txt b/changelog.txt
index aa0cac31..b69d9fd4 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,5 @@
 ---version 2.0.4 yet to be released---
+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
 12-mar-2009 - adelikat - Win32 - Trace Logger - fixed bug where user can't scroll the log window while it is auto-updating
diff --git a/src/fceu.cpp b/src/fceu.cpp
index 6982af69..c7ee63ba 100644
--- a/src/fceu.cpp
+++ b/src/fceu.cpp
@@ -126,6 +126,9 @@ static void CloseGame(void)
 		delete GameInfo;
 		GameInfo = 0;
 
+		//Reset frame counter
+		currFrameCounter = 0;
+
 		//Reset flags for Undo/Redo/Auto Savestating
 		lastSavestateMade[0] = 0;
 		undoSS = false;
diff --git a/src/state.cpp b/src/state.cpp
index 1d8b611a..60691d9b 100644
--- a/src/state.cpp
+++ b/src/state.cpp
@@ -669,6 +669,7 @@ bool FCEUSS_Load(const char *fname)
 	else
 	{
 		string fn = FCEU_MakeFName(FCEUMKF_STATE,CurrentState,fname);
+		FCEUI_printf("%s",fn.c_str());
 		st=FCEUD_UTF8_fstream(fn,"rb");
 		strcpy(lastLoadstateMade,fn.c_str());
 	}