0.44: initial state switch fixed