Fix based on latest ES6 text