Fix SelectState

Need to fix SelectState.