Fix arrow function support.

Fix for arrow functions #1363