Fix bug for missing 'data.' on all scope variables