Hacking on polyfill
Add index