--- flashvideo.module	2009-12-26 17:16:54.000000000 -0600
+++ /Users/mjarrell/Sites/drupal/sites/all/modules/drupal-contrib/flashvideo/flashvideo.module	2009-12-27 00:29:16.000000000 -0600
@@ -751,6 +751,12 @@ function _flashvideo_perform_postop($old
             // db_storage = 0 means 'stored in its own table'.  Single upload fields = 1.  Shared fields and Multi-values = 0.
             db_query("UPDATE {". $cck_finished_thumbnail_field_db_info['table'] ."} SET ". $cck_finished_thumbnail_field_db_info['columns']['fid']['column'] ." = %d, ". $cck_finished_thumbnail_field_db_info['columns']['list']['column'] ." = 0 WHERE nid = %d", $newfile->fid, $newfile->nid);
           }
+          else if (!isset($cck_finished_video_field_db_info['columns']['delta'])) {
+            // Get rid of the initial NULL entry.
+            db_query("DELETE FROM {". $cck_finished_thumbnail_field_db_info['table'] ."} WHERE nid = %d AND ". $cck_finished_thumbnail_field_db_info['columns']['fid']['column'] ." IS NULL", $newfile->nid);
+            // The same query as the one below, just without the delta values
+            db_query("INSERT INTO {". $cck_finished_thumbnail_field_db_info['table'] ."} (vid, nid, delta, ". $cck_finished_thumbnail_field_db_info['columns']['fid']['column'] .", ". $cck_finished_thumbnail_field_db_info['columns']['list']['column'] .") VALUES (%d, %d, %d, 0)", $newfile->vid, $newfile->nid, $newfile->fid);
+          }
           else { // For multi-upload file fields
             // Get rid of the initial NULL entry.
             db_query("DELETE FROM {". $cck_finished_thumbnail_field_db_info['table'] ."} WHERE nid = %d AND ". $cck_finished_thumbnail_field_db_info['columns']['fid']['column'] ." IS NULL", $newfile->nid);
@@ -763,6 +769,12 @@ function _flashvideo_perform_postop($old
             // db_storage = 0 means 'stored in its own table'.  Single upload fields = 1.  Shared fields and Multi-values = 0.
             db_query("UPDATE {". $cck_finished_video_field_db_info['table'] ."} SET ". $cck_finished_video_field_db_info['columns']['fid']['column'] ." = %d, ". $cck_finished_video_field_db_info['columns']['list']['column'] ." = 0 WHERE nid = %d", $newfile->fid, $newfile->nid);
           }
+          else if (!isset($cck_finished_video_field_db_info['columns']['delta'])) {
+            // Get rid of the initial NULL entry.
+            db_query("DELETE FROM {". $cck_finished_thumbnail_field_db_info['table'] ."} WHERE nid = %d AND ". $cck_finished_thumbnail_field_db_info['columns']['fid']['column'] ." IS NULL", $newfile->nid);
+            // The same query as the one below, just without the delta values
+            db_query("INSERT INTO {". $cck_finished_thumbnail_field_db_info['table'] ."} (vid, nid, delta, ". $cck_finished_thumbnail_field_db_info['columns']['fid']['column'] .", ". $cck_finished_thumbnail_field_db_info['columns']['list']['column'] .") VALUES (%d, %d, %d, 0)", $newfile->vid, $newfile->nid, $newfile->fid);
+          }
           else { // For multi-upload file fields
             // Get rid of the initial NULL entry.
             db_query("DELETE FROM {". $cck_finished_video_field_db_info['table'] ."} WHERE nid = %d AND ". $cck_finished_video_field_db_info['columns']['fid']['column'] ." IS NULL", $newfile->nid);
@@ -1433,6 +1445,12 @@ function flashvideo_import($path, $node_
           if ($cck_original_video_field['db_storage'] == 1) {
             db_query("UPDATE {". $cck_original_video_field_db_info['table'] ."} SET ". $cck_original_video_field_db_info['columns']['fid']['column'] ." = %d, ". $cck_original_video_field_db_info['columns']['list']['column'] ." = 0 WHERE nid = %d", $tempfile->fid, $node->nid);
           }
+          else if (!isset($cck_finished_video_field_db_info['columns']['delta'])) {
+            // Get rid of the initial NULL entry.
+            db_query("DELETE FROM {". $cck_original_video_field_db_info['table'] ."} WHERE nid = %d AND ". $cck_original_video_field_db_info['columns']['fid']['column'] ." IS NULL", $node->nid);
+            // The same query as the one below, just without the delta values
+            db_query("INSERT INTO {". $cck_original_video_field_db_info['table'] ."} (vid, nid, ". $cck_original_video_field_db_info['columns']['fid']['column'] .", ". $cck_original_video_field_db_info['columns']['list']['column'] .") VALUES (%d, %d, %d, 0)", $node->nid, $node->nid, $tempfile->fid);
+          }
           else { // For multi-upload file fields
             // Get rid of the initial NULL entry.
             db_query("DELETE FROM {". $cck_original_video_field_db_info['table'] ."} WHERE nid = %d AND ". $cck_original_video_field_db_info['columns']['fid']['column'] ." IS NULL", $node->nid);