Fixed polyfills again