BF: better polyfill