Fixed up leaky state