Init state fix