diff --git a/retroarch.c b/retroarch.c
index 052c59b5b6..2b526efc02 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2185,8 +2185,9 @@ static void check_rewind(void)
       if (cnt == 0)
 #endif
       {
-         pretro_serialize(g_extern.state_buf, g_extern.state_size);
-         state_manager_push(g_extern.state_manager, g_extern.state_buf);
+         void* state=state_manager_push_where(g_extern.state_manager);
+         pretro_serialize(state, g_extern.state_size);
+         state_manager_push_do(g_extern.state_manager);
       }
    }
 
diff --git a/rewind.h b/rewind.h
index 8ad30a9598..b72bc1f630 100644
--- a/rewind.h
+++ b/rewind.h
@@ -27,7 +27,7 @@ state_manager_t *state_manager_new(size_t state_size, size_t buffer_size);
 void state_manager_free(state_manager_t *state);
 bool state_manager_pop(state_manager_t *state, void **data);
 void *state_manager_push_where(state_manager_t *state);
-bool state_manager_push(state_manager_t *state);
+bool state_manager_push_do(state_manager_t *state);
 void state_manager_capacity(state_manager_t *state, unsigned int * entries, size_t * bytes, bool * full);
 
 #endif