Fixed ES6 arrow functions