statemanager fix