Temp fix for ensuring data function called with proper thisArg...

- data function to be reworked over next few weeks
- cc Issue #355