--- C:/Websites/uc_out_of_stock/uc_out_of_stock.module	Tue Jun 02 09:54:26 2009
+++ C:/Websites/uc_out_of_stock_new/uc_out_of_stock.module	Sun Jul 05 20:01:05 2009
@@ -83,6 +83,7 @@
           if ($row->active) {
             $stockinfo['stock'] = $row->stock;
             $stockinfo['model'] = $row->model;
+			$stockinfo['mainproduct'] = FALSE;
           }
         }
       }
@@ -103,6 +104,7 @@
     while ($row = db_fetch_object($result)) {
       $stockinfo['stock'] = $row->stock;
       $stockinfo['model'] = $row->model;
+	  $stockinfo['mainproduct'] = TRUE;
     }
   }
 
@@ -168,6 +170,7 @@
  */
 function uc_out_of_stock_validate_addtocart($nid, $attrs) {
   $error = FALSE;
+  /* Stock information for product that is being added to cart*/
   $stockinfo = uc_out_of_stock_getstockinfo($nid, $attrs);
   if ($stockinfo) {
     if ($stockinfo['stock'] <= 0) {
@@ -177,7 +180,7 @@
       $qty = 0;
       $items = uc_cart_get_contents();
       foreach ($items as $item) {
-        if ($item->nid == $nid && (!count($attrs) || count($attrs) && $item->data['attributes'] == $attrs)) {
+        if ($item->nid == $nid && (!count($attrs) || !$stockinfo['mainproduct'] && count($attrs) && $item->data['model']==$stockinfo['model'] || $stockinfo['mainproduct'] && !$item->data['model'])) {
           $qty += $item->qty;
         }
       }