Workaround for SD polyfill issue