Make polyfill works first for selection #2