Fix choice to work with :any state.