diff --git a/node_embed.module b/node_embed.module
index 99e0be2..b9d12ae 100644
--- a/node_embed.module
+++ b/node_embed.module
@@ -70,6 +70,9 @@ function _node_embed_replacements($matches) {
     if (!isset($node->node_embed_parameters['view_mode'])) {
       $node->node_embed_parameters['view_mode'] = 'node_embed';
     }
+     if(isset($node->body['und'][0])){
+         $node->body['und'][0]['value'] = strstr($node->body['und'][0]['value'], $matches[0]);
+     }
 
     $view = node_view($node, $node->node_embed_parameters['view_mode'], NULL);
     $render = drupal_render($view);
@@ -219,9 +222,11 @@ function node_embed_wysiwyg_include_directory($type) {
 }
 
 /**
- * Implements hook_page_build().
+ * Implements hook_init().
+ *
+ * Attach the needed css files if we're on a form page.
  */
-function node_embed_page_build() {
+function node_embed_init() {
   drupal_add_css(drupal_get_path('module', 'node_embed') . '/plugins/node_embed/node_embed.css');
 }