diff --git a/app/Helpers/Email/EmailBuilder.php b/app/Helpers/Email/EmailBuilder.php
index 1be706e54b02..6504f1c06f00 100644
--- a/app/Helpers/Email/EmailBuilder.php
+++ b/app/Helpers/Email/EmailBuilder.php
@@ -75,7 +75,6 @@ class EmailBuilder
      */
     public function setSubject($subject)
     {
-        //$this->subject = $this->parseTemplate($subject, false, $this->contact);
 
         if (! empty($this->variables)) {
             $subject = str_replace(array_keys($this->variables), array_values($this->variables), $subject);
diff --git a/app/Jobs/Invoice/EmailInvoice.php b/app/Jobs/Invoice/EmailInvoice.php
index 99d3979bc8a2..8a3a92183f9b 100644
--- a/app/Jobs/Invoice/EmailInvoice.php
+++ b/app/Jobs/Invoice/EmailInvoice.php
@@ -70,7 +70,8 @@ class EmailInvoice extends BaseMailerJob implements ShouldQueue
      * @return void
      */
     public function handle()
-    {info("invoice email");
+    {
+
         MultiDB::setDB($this->company->db);
 
         $this->setMailDriver();
diff --git a/app/Utils/PhantomJS/Phantom.php b/app/Utils/PhantomJS/Phantom.php
index 366e4c066afb..68f3b32c21cf 100644
--- a/app/Utils/PhantomJS/Phantom.php
+++ b/app/Utils/PhantomJS/Phantom.php
@@ -37,10 +37,13 @@ class Phantom
 
         if ($invitation instanceof InvoiceInvitation) {
             $entity = 'invoice';
+            $entity_design_id = 'invoice_design_id';
         } elseif ($invitation instanceof CreditInvitation) {
             $entity = 'credit';
+            $entity_design_id = 'credit_design_id';
         } elseif ($invitation instanceof QuoteInvitation) {
             $entity = 'quote';
+            $entity_design_id = 'quote_design_id';
         }
 
         $entity_obj = $invitation->{$entity};
@@ -81,6 +84,7 @@ class Phantom
         $invitation_instance = 'App\Models\\'.ucfirst($entity).'Invitation';
 
         $invitation = $invitation_instance::whereRaw('BINARY `key`= ?', [$invitation_key])->first();
+        
 
         $entity_obj = $invitation->{$entity};
 
@@ -88,13 +92,15 @@ class Phantom
 
         App::setLocale($invitation->contact->preferredLocale());
 
-        $design_id = $entity_obj->design_id ? $entity_obj->design_id : $this->decodePrimaryKey($entity_obj->client->getSetting($entity.'_design_id'));
+        // $design_id = $entity_obj->design_id ? $entity_obj->design_id : $this->decodePrimaryKey($entity_obj->client->getSetting($entity_design_id));
+        // $design = Design::find($design_id);
+        // $designer = new Designer($entity_obj, $design, $entity_obj->client->getSetting('pdf_variables'), $entity);
+        // $data['html'] = (new HtmlEngine($designer, $invitation, $entity))->build();
 
-        $design = Design::find($design_id);
-
-        $designer = new Designer($entity_obj, $design, $entity_obj->client->getSetting('pdf_variables'), $entity);
-
-        $data['html'] = (new HtmlEngine($designer, $invitation, $entity))->build();
+        $entity_design_id = $entity . '_design_id';
+        $entity_design_id = $entity_obj->design_id ? $entity_obj->design_id : $this->decodePrimaryKey($entity_obj->client->getSetting($entity_design_id));
+        $design = Design::find($entity_design_id);
+        $data['html'] = new HtmlEngine(null, $invitation, $entity);
 
         return view('pdf.html', $data);
     }