Fix to work with selectors