fix statemanater