1 files changed, 6 insertions, 3 deletions
diff --git a/lib/handlebars/base.js b/lib/handlebars/base.js
index 56eb016..fe03dff 100644
--- a/lib/handlebars/base.js
+++ b/lib/handlebars/base.js
@@ -1,4 +1,3 @@
-/*globals Exception, Utils */
 module Utils from "./utils";
 import Exception from "./exception";
 
@@ -93,7 +92,7 @@ function registerDefaultHelpers(instance) {
         for(var j = context.length; i<j; i++) {
           if (data) {
             data.index = i;
-            data.first = (i === 0)
+            data.first = (i === 0);
             data.last  = (i === (context.length-1));
           }
           ret = ret + fn(context[i], { data: data });
@@ -101,7 +100,11 @@ function registerDefaultHelpers(instance) {
       } else {
         for(var key in context) {
           if(context.hasOwnProperty(key)) {
-            if(data) { data.key = key; }
+            if(data) { 
+              data.key = key; 
+              data.index = i;
+              data.first = (i === 0);
+            }
             ret = ret + fn(context[key], {data: data});
             i++;
           }