Fix the state issue