Cross-browser support improved (W.R.T. ES6)