diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 4a20d1f23a21..368aa5c22201 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -75,6 +75,8 @@ class CheckData extends Command
             config(['database.default' => $database]);
         }
 
+        $this->checkContacts();
+
         if (! $this->option('client_id')) {
             $this->checkBlankInvoiceHistory();
             $this->checkPaidToDate();
@@ -84,7 +86,6 @@ class CheckData extends Command
         //$this->checkInvoices();
         $this->checkInvoiceBalances();
         $this->checkClientBalances();
-        $this->checkContacts();
         $this->checkUserAccounts();
         //$this->checkLogoFiles();
 
diff --git a/app/Constants.php b/app/Constants.php
index 0231b54d38a5..c4b547502982 100644
--- a/app/Constants.php
+++ b/app/Constants.php
@@ -361,7 +361,7 @@ if (! defined('APP_NAME')) {
     define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com'));
     define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'https://invoice-ninja.readthedocs.io/en/latest'));
     define('NINJA_DATE', '2000-01-01');
-    define('NINJA_VERSION', '4.5.38' . env('NINJA_VERSION_SUFFIX'));
+    define('NINJA_VERSION', '4.5.39' . env('NINJA_VERSION_SUFFIX'));
     define('NINJA_TERMS_VERSION', '1.0.1');
 
     define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'));
diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php
index 2205fde74564..e958afdc904b 100644
--- a/app/Traits/GenerateMigrationResources.php
+++ b/app/Traits/GenerateMigrationResources.php
@@ -840,7 +840,13 @@ info("get company");
         return 1;
 
     }
-
+/**
+    const STATUS_DRAFT = 1;
+    const STATUS_SENT = 2;
+    const STATUS_APPROVED = 3;
+    const STATUS_CONVERTED = 4;
+    const STATUS_EXPIRED = -1;
+ */
     private function transformQuoteStatusId($quote)
     {
 
@@ -1059,6 +1065,7 @@ info("get company");
                 'tax_name2' => $quote->tax_name2,
                 'tax_rate1' => $quote->tax_rate1,
                 'tax_rate2' => $quote->tax_rate2,
+                'invoice_id' => $quote->quote_invoice_id,
                 'custom_surcharge1' => $quote->custom_value1 ?: '',
                 'custom_surcharge2' => $quote->custom_value2 ?: '',
                 'custom_value1' => $quote->custom_text_value1 ?: '',
@@ -1371,6 +1378,9 @@ info("translated gateway_type = {$translated_gateway_type}");
                     'custom_value2' => '',
                     'custom_value3' => '',
                     'custom_value4' => '',
+                    'created_at' => $account_gateway->created_at ? Carbon::parse($account_gateway->created_at)->toDateString() : null,
+                    'updated_at' => $account_gateway->updated_at ? Carbon::parse($account_gateway->updated_at)->toDateString() : null,
+                    'deleted_at' => $account_gateway->deleted_at ? Carbon::parse($account_gateway->deleted_at)->toDateString() : null,
                 ];
             // }
         }
diff --git a/docs/conf.py b/docs/conf.py
index 01a27935488e..d59ca31d2009 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -59,7 +59,7 @@ author = u'Invoice Ninja'
 # The short X.Y version.
 version = u'4.5'
 # The full version, including alpha/beta/rc tags.
-release = u'4.5.38'
+release = u'4.5.39'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/resources/views/invoices/pdf.blade.php b/resources/views/invoices/pdf.blade.php
index bff62bc1819a..075c6579fdc8 100644
--- a/resources/views/invoices/pdf.blade.php
+++ b/resources/views/invoices/pdf.blade.php
@@ -1,5 +1,5 @@
 @if (empty($hide_pdf))
-<object id="pdfObject" type="application/pdf" style="display:block;background-color:#525659;border:solid 2px #9a9a9a;" frameborder="1" width="100%" height="{{ isset($pdfHeight) ? $pdfHeight : 1180 }}px"></object>
+<object id="pdfObject" style="display:block;background-color:#525659;border:solid 2px #9a9a9a;" frameborder="1" width="100%" height="{{ isset($pdfHeight) ? $pdfHeight : 1180 }}px"></object>
 <div id="pdfCanvas" style="display:none;width:100%;background-color:#525659;border:solid 2px #9a9a9a;padding-top:40px;text-align:center">
     <canvas id="theCanvas" style="max-width:100%;border:solid 1px #CCCCCC;"></canvas>
 </div>