diff --git drush/module_builder.drush.inc drush/module_builder.drush.inc
index b3bc67f..a7925ec 100644
--- drush/module_builder.drush.inc
+++ drush/module_builder.drush.inc
@@ -317,14 +317,16 @@ function module_builder_build_data($commands) {
     }
     
     // Third pass: set a default value from the definition or a callback.
-    if (empty($module_data[$name] && isset($definition['default'])) {
-      $module_data[$name] = $definition['default'];
-    }
-    elseif (isset($definition['default_callback'])) {
-      $function = $definition['default_callback'];
-      $module_data[$name] = $function($commands, $module_data);
+    if (empty($module_data[$name])) {
+      if (isset($definition['default'])) {
+        $module_data[$name] = $definition['default'];
+        continue;
+      }
+      elseif (isset($definition['default_callback'])) {
+        $function = $definition['default_callback'];
+        $module_data[$name] = $function($commands, $module_data);
+      }
     }
-    
   }
   
   // Extra processing for the hooks array (or not).