StateManager fix