diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index a90bfc6..edbbe56 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -496,7 +496,8 @@ void RetroFE::run( )
                 {
                     // Empty event queue
                     SDL_Event e;
-                    while ( SDL_PollEvent( &e ) );
+                    while ( SDL_PollEvent( &e ) )
+                        input_.update(e);
                     input_.resetStates( );
                 }
                 state = RETROFE_IDLE;
@@ -663,7 +664,8 @@ void RetroFE::run( )
                 {
                     // Empty event queue
                     SDL_Event e;
-                    while ( SDL_PollEvent( &e ) );
+                    while ( SDL_PollEvent( &e ) )
+                        input_.update(e);
                     input_.resetStates( );
                 }
                 state = RETROFE_IDLE;
@@ -906,14 +908,16 @@ void RetroFE::run( )
 
             // Empty event queue
             SDL_Event e;
-            while ( SDL_PollEvent( &e ) );
+            while ( SDL_PollEvent( &e ) )
+                input_.update(e);
             input_.resetStates( );
 
             // Handle menu entry
             m.handleEntry( currentPage_->getSelectedItem( ) );
 
             // Empty event queue
-            while ( SDL_PollEvent( &e ) );
+            while ( SDL_PollEvent( &e ) )
+                input_.update(e);
             input_.resetStates( );
 
             state = RETROFE_IDLE;
@@ -1033,7 +1037,8 @@ void RetroFE::run( )
                 {
                     // Empty event queue
                     SDL_Event e;
-                    while ( SDL_PollEvent( &e ) );
+                    while ( SDL_PollEvent( &e ) )
+                        input_.update(e);
                     input_.resetStates( );
                 }
                 state = RETROFE_IDLE;
@@ -1076,7 +1081,8 @@ void RetroFE::run( )
             if ( currentPage_->isIdle( ) )
             {
                 SDL_Event e;
-                while ( SDL_PollEvent( &e ) );
+                while ( SDL_PollEvent( &e ) )
+                    input_.update(e);
                 input_.resetStates( );
                 state = RETROFE_IDLE;
             }
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index 6d16cc9..9fb3028 100644
--- a/RetroFE/Source/Version.cpp
+++ b/RetroFE/Source/Version.cpp
@@ -21,7 +21,7 @@
 
 std::string retrofe_version_major = "0";
 std::string retrofe_version_minor = "9";
-std::string retrofe_version_build = "7";
+std::string retrofe_version_build = "8";
 
 
 std::string Version::getString( )