diff --git a/tasks/config/project/tasks.js b/tasks/config/project/tasks.js
index 7d6c08af4..2c7a4476d 100644
--- a/tasks/config/project/tasks.js
+++ b/tasks/config/project/tasks.js
@@ -32,7 +32,7 @@ module.exports = {
 
       // remove all comments from config files (.variable)
       variables : {
-        in  : /\/\*[\s\S]+\/\* End Config \*\//m,
+        in  : /\/\*[\s\S]+?\/\* End Config \*\//m,
         out : '',
       },
 
diff --git a/tasks/docs/serve.js b/tasks/docs/serve.js
index 35c78b59a..a2a86f346 100644
--- a/tasks/docs/serve.js
+++ b/tasks/docs/serve.js
@@ -132,7 +132,7 @@ module.exports = function () {
         lessPath = util.replaceExtension(file.path, '.less');
         lessPath = lessPath.replace(source.site, source.definitions);
       }
-      else if(isDefinition) {
+      else {
         console.log('Change detected in definition');
         lessPath = file.path;
       }
diff --git a/tasks/watch.js b/tasks/watch.js
index b5cb3fe94..cf15f293d 100644
--- a/tasks/watch.js
+++ b/tasks/watch.js
@@ -122,7 +122,7 @@ module.exports = function(callback) {
         lessPath = util.replaceExtension(file.path, '.less');
         lessPath = lessPath.replace(source.site, source.definitions);
       }
-      else if(isDefinition) {
+      else {
         console.log('Change detected in definition');
         lessPath = file.path;
       }