Make state reset more explicit