diff --git a/app/Http/routes.php b/app/Http/routes.php
index df9d0b6ee84a..03f4fded6415 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -356,7 +356,7 @@ define('NINJA_GATEWAY_ID', GATEWAY_STRIPE);
 define('NINJA_GATEWAY_CONFIG', '');
 define('NINJA_WEB_URL', 'https://www.invoiceninja.com');
 define('NINJA_APP_URL', 'https://app.invoiceninja.com');
-define('NINJA_VERSION', '2.2.0');
+define('NINJA_VERSION', '2.2.1');
 define('NINJA_DATE', '2000-01-01');
 define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com');
 define('RELEASES_URL', 'https://github.com/hillelcoren/invoice-ninja/releases/');
diff --git a/public/js/built.js b/public/js/built.js
index 06e46a9d8c1f..dbdef2e570c2 100644
--- a/public/js/built.js
+++ b/public/js/built.js
@@ -32588,7 +32588,7 @@ function displayInvoiceItems(doc, invoice, layout) {
     }
     shownItem = true;
 
-    var numLines = doc.splitTextToSize(item.notes, 200).length + 2;
+    var numLines = Math.max(doc.splitTextToSize(item.notes, 200).length, doc.splitTextToSize(item.product_key, 60).length) + 2;
     //console.log('num lines %s', numLines);
 
     var y = tableTop + (line * layout.tableRowHeight) + (2 * layout.tablePadding);
diff --git a/public/js/script.js b/public/js/script.js
index e14bb393c862..acb0252b0a7a 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1053,7 +1053,7 @@ function displayInvoiceItems(doc, invoice, layout) {
     }
     shownItem = true;
 
-    var numLines = doc.splitTextToSize(item.notes, 200).length + 2;
+    var numLines = Math.max(doc.splitTextToSize(item.notes, 200).length, doc.splitTextToSize(item.product_key, 60).length) + 2;
     //console.log('num lines %s', numLines);
 
     var y = tableTop + (line * layout.tableRowHeight) + (2 * layout.tablePadding);
diff --git a/resources/views/accounts/product.blade.php b/resources/views/accounts/product.blade.php
index b9e44aab8385..9c12aea4aaa2 100644
--- a/resources/views/accounts/product.blade.php
+++ b/resources/views/accounts/product.blade.php
@@ -4,7 +4,7 @@
   @parent
 
   {!! Former::open($url)->method($method)
-      ->rules(['product_key' => 'required|max:20'])
+      ->rules(['product_key' => 'required|max:255'])
       ->addClass('col-md-8 col-md-offset-2 warn-on-exit') !!}
 
 
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index 2ff17d8ba0b2..39f4d86d0108 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -24,7 +24,7 @@
 
 	{!! Former::open($url)->method($method)->addClass('warn-on-exit')->rules(array(
 		'client' => 'required',
-		'product_key' => 'max:20'
+		'product_key' => 'max:255'
 	)) !!}