Fix for polyfill