Arrow Functions bugfixing