--- product/product.module.orig	2008-04-25 10:32:41.000000000 +0200
+++ product/product.module	2008-04-25 10:34:16.000000000 +0200
@@ -1069,9 +1069,11 @@ function product_menu($may_cache) {
 function product_nodeapi(&$node, $op, $a3 = NULL, $a4 = NULL) {
   switch ($op) {
     case 'load':
-      if ($product = product_load($node)) {
-        foreach ($product as $key => $value) {
-          $node->$key = $value;
+      if (variable_get('ec_product_convert_'. $node->type, variable_get('ec_product_convert', 0))) {
+        if ($product = product_load($node)) {
+          foreach ($product as $key => $value) {
+            $node->$key = $value;
+          }
         }
       }
       break;