diff --git a/uc_node_checkout.module b/uc_node_checkout.module
index 9c0b8f7..6ed841f 100644
--- a/uc_node_checkout.module
+++ b/uc_node_checkout.module
@@ -819,8 +819,8 @@ function uc_node_checkout_cart_item($op, &$item) {
     case 'can_ship':
       // Look at the default $item settings to determine if there is a
       // shippable component to this node checkout product
-      if (isset($item->data['nid']) &&
-          $uc_node_checkout_product = node_load($item->data['nid'])) {
+      if (isset($item->data['node_checkout_nid']) &&
+          $uc_node_checkout_product == node_load($item->data['nid'])) {
         // If the item was set to be 'shippable' on the node edit form of the
         // uc_node_checkout product, not the associated node to purchase, then
         // we'll send this off to Ubercart as a 'shippable' item and Ubercart
@@ -837,7 +837,7 @@ function uc_node_checkout_cart_item($op, &$item) {
         }
       }
       else {
-        // $item->data['nid'] was not found or unable to node_load $item->data['nid']'s nid. So show an error:
+        // $item->data['node_checkout_nid'] was not found or unable to node_load $item->data['nid']'s node. So show an error:
         drupal_set_message(t('Unable to determine the product class associated with item ' . $item->data['title'] . ' so the shipping pane is included on this Ubercart display'), 'error');
       }
       break;