Arrow functions bug-fix