diff --git a/index.html b/index.html
index 68d0c76b7..7d09da674 100644
--- a/index.html
+++ b/index.html
@@ -229,12 +229,17 @@
 			type="module"
 			src="<%= htmlWebpackPlugin.files.chunks[chunk].entry %>"
 		></script>
-		<script nomodule src="<%= chunk %>.legacy.bundle.js"></script>
 		<% } %>
 
+		<!-- Polyfill and source for old browser -->
 		<!-- Add polyfill.io for a very narrow web feature
 			IntersectionObserver : SAFARI 11 & 12.0  https://caniuse.com/#search=intersectionobserver
+			Intl : SAFARI 9 & 10.0  https://caniuse.com/#search=Intl
 		-->
-		<script src="https://polyfill.io/v2/polyfill.min.js?features=IntersectionObserver"></script>
+		<script src="https://polyfill.io/v3/polyfill.min.js?features=Intl%2CIntersectionObserver"></script>
+		<% for (var chunk in htmlWebpackPlugin.files.chunks) { %>
+			<script nomodule src="<%= chunk %>.legacy.bundle.js"></script>
+		<% } %>
+
 	</body>
 </html>