diff --git a/app/models/site_construct.rb b/app/models/site_construct.rb
index 58e20ad..ae23eb6 100644
--- a/app/models/site_construct.rb
+++ b/app/models/site_construct.rb
@@ -230,10 +230,11 @@ class SiteConstruct
     custom_default_domain_name = ""
     domain_names = domain_name.strip().split(" ")
     if default_domain_idx == -1
-      custom_default_domain_name = site_server.default_domain_names.select do |default_domain_name|
+      site_server.default_domain_names.each do |default_domain_name|
         default_domain_name = Regexp.new("\\A"+default_domain_name.gsub(".","\\.").gsub("*","[^.]*"))
-        domain_names.select{|n| n.match(default_domain_name) }.count != 0
-      end.first
+        custom_default_domain_name = domain_names.select{|n| n.match(default_domain_name) }.first
+        break if custom_default_domain_name.present?
+      end
     else
       custom_default_domain_name = domain_names[default_domain_idx]
     end