Selector can be unset on client. If so, create it.
merge pull request