Fix SelectState