Fix based on the latest ES6 text