Fix the state