diff --git a/grunt.js b/grunt.js
index 5f684a5..6e448f9 100644
--- a/grunt.js
+++ b/grunt.js
@@ -159,8 +159,7 @@ module.exports = function(grunt) {
               'src/inputs/date/*.js',
               'src/inputs/dateui/*.js',
               'src/inputs/wysihtml5/*.js',
-              'src/inputs/combodate/combodate.js',
-              'src/inputs/combodate/lib/combodate.js',
+              'src/inputs/combodate/*.js',
               'src/inputs-ext/**/*.js'
               ]
     },
diff --git a/src/inputs/combodate/combodate.js b/src/inputs/combodate/combodate.js
index 6f25eb1..d2bc48b 100644
--- a/src/inputs/combodate/combodate.js
+++ b/src/inputs/combodate/combodate.js
@@ -32,6 +32,9 @@ $(function(){
 });
 </script>
 **/
+
+/*global moment*/
+
 (function ($) {
 
     var Constructor = function (options) {
@@ -165,7 +168,7 @@ $(function(){
         }
         **/
         combodate: {
-        },
+        }
         
         /*
         (not implemented yet)
diff --git a/src/inputs/combodate/lib/combodate.js b/src/inputs/combodate/lib/combodate.js
index e27adff..673e23b 100644
--- a/src/inputs/combodate/lib/combodate.js
+++ b/src/inputs/combodate/lib/combodate.js
@@ -61,8 +61,8 @@
 
             //first pass
             $.each(this.map, function(k, v) {
-                var v = v[0], 
-                    r = new RegExp(v+'+'),
+                v = v[0]; 
+                var r = new RegExp(v+'+'),
                     token = v.length > 1 ? v.substring(1, 2) : v;
                     
                 tpl = tpl.replace(r, '{'+token+'}');
@@ -73,8 +73,8 @@
 
             //second pass
             $.each(this.map, function(k, v) {
-                var v = v[0],
-                    token = v.length > 1 ? v.substring(1, 2) : v;
+                v = v[0];
+                var token = v.length > 1 ? v.substring(1, 2) : v;
                     
                 tpl = tpl.replace('{'+token+'}', '<select class="'+k+'"></select>');
             });