Fix more leaky state