Fixes #887 (#888)
Fixes #887 (#888)


jonathan-fielding/polyfill-service,kdzwinel/polyfill-service,mcshaz/polyfill-service,jonathan-fielding/polyfill-service,jonathan-fielding/polyfill-service,JakeChampion/polyfill-service,JakeChampion/polyfill-service,mcshaz/polyfill-service,kdzwinel/polyfill-service,kdzwinel/polyfill-service,mcshaz/polyfill-service