Fix for ES6 syntax