diff --git a/app/models/site_construct.rb b/app/models/site_construct.rb
index f46cb8b..9769213 100644
--- a/app/models/site_construct.rb
+++ b/app/models/site_construct.rb
@@ -142,7 +142,7 @@ class SiteConstruct
     if old_server_block.present?   
       new_server_block = old_server_block.gsub('\n',"\n").gsub(/(listen\s+)[^;]+/){|ff| "#{$1}#{port_text}"}
       if port_text == "80"
-        new_server_block = new_server_block.gsub(/[ \t]*#\s*managed by Certbot/,'')
+        new_server_block = new_server_block.gsub(/^(?:(?!{|}).)*#\s*managed by Certbot(\n|$)/,'')
       else
         if self.site_cert && !(self.site_cert.is_certbot)
           new_server_block = new_server_block.gsub(/[ \t]*#\s*managed by Certbot/,'')