Fixed bad polyfill for #181