Polyfill bugfix