--- flexinode.module.dist	Fri Apr  2 21:00:29 2004
+++ flexinode.module	Wed Apr 21 20:57:42 2004
@@ -517,18 +517,14 @@
     }
   }
   
-  // force "read more" link
-  $node->teaser .= " ";
-  
   return $error;
 }
 
 
 function flexinode_view($node, $main = 0, $page = 0) {
   if ($main) {
-    $node->teaser = check_output($node->teaser) . " ";
-    $node->body = check_output($node->body);
-    return theme("node", $node, $main, $page);
+    $node->body .= ' '; // force 'read more' link
+    return theme("node", node_prepare($node, $main), $main, $page);
   } else {
     $node = flexinode_content($node);
     return theme("node", $node, $main, $page);
@@ -539,7 +535,7 @@
 function flexinode_content($node) {
   $ctype = flexinode_load_content_type($node->ctype_id);
   
-  $node->original_body = check_output($node->body);
+  $node->original_body = $node->body = check_output($node->body);
   
   foreach ($ctype->fields as $field) {
     $fieldname = "flexinode_". $field->field_id;