trying to fix issue around savestate