--- stockapi.module_orig	2009-01-30 15:47:43.000000000 -0800
+++ stockapi.module	2009-02-03 09:02:26.000000000 -0800
@@ -108,13 +108,26 @@ function stockapi_fetch($symbol) {
     return FALSE;
   }
 
-  $data = explode(',', str_replace('"', '', $result->data));
+  $data = explode(',', $result->data);
+
+  for ($i=0; $i < count($data); $i++) {
+    $value = trim($data[$i]);
+    if ((substr($value, 0, 1) == '"') && (substr($value, strlen($value) - 1, 1)) != '"') {
+      $data[$i] = str_replace('"', '', ($value .','. $data[$i+1]));
+      unset($data[$i+1]);
+      $i++;
+    }
+    else {
+      $data[$i] = str_replace('"', '', $value);
+    }
+  }
+
   if (!$data) {
     watchdog('stockapi', t('StockAPI: no data for symbol(s): @symbol', array('@symbol' => $symbol)));
     return FALSE;
   }
   
-  $data = array_map('trim', $data);
+  $data = array_values($data);
   return $data;
 }
 
@@ -164,4 +177,4 @@ function stockapi_insert($stock) {
 
 function stockapi_delete($symbol) {
   return db_query("DELETE FROM {stockapi} WHERE symbol = '%s'", $symbol);
-}
\ No newline at end of file
+}
