diff --git a/htdocs/product/canvas/service/product.service.class.php b/htdocs/product/canvas/service/product.service.class.php
index 53f821d0511..22f2b6e943b 100644
--- a/htdocs/product/canvas/service/product.service.class.php
+++ b/htdocs/product/canvas/service/product.service.class.php
@@ -80,6 +80,9 @@ class ProductService extends Product
 		
 		parent::assign_values($action);
 		
+		// Duration
+		$this->tpl['duration_value'] = $this->duration_value;
+		
 		if ($action == 'create')
 		{
 			// Title
diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php
index d8432da820f..0bd5922f311 100644
--- a/htdocs/product/fiche.php
+++ b/htdocs/product/fiche.php
@@ -220,10 +220,10 @@ if ($_POST["action"] == 'update' && ($user->rights->produit->creer || $user->rig
 	}
 	else
 	{
-		if (!empty($_POST["canvas"]) && file_exists('canvas/'.$product->canvas.'/product.'.$product->canvas.'.class.php'))
+		if (!empty($_POST["canvas"]) && file_exists('canvas/'.$_POST["canvas"].'/product.'.$_POST["canvas"].'.class.php'))
 		{
-			$classname = 'Product'.ucfirst($product->canvas);
-			include_once('canvas/'.$product->canvas.'/product.'.$product->canvas.'.class.php');
+			$classname = 'Product'.ucfirst($_POST["canvas"]);
+			include_once('canvas/'.$_POST["canvas"].'/product.'.$_POST["canvas"].'.class.php');
 			$product = new $classname($db);
 		}