diff --git a/modules/graphviz/graphviz.info b/modules/graphviz/graphviz.info
index e091b3e..94c66db 100644
--- a/modules/graphviz/graphviz.info
+++ b/modules/graphviz/graphviz.info
@@ -3,5 +3,6 @@ description = A text implementation of the Graphviz data structure
 package = Visualization
 core = 7.x
 dependencies[] = graphapi
+dependencies[] = graphviz_filter
 
 files[] = graphviz.module
diff --git a/modules/graphviz/graphviz.module b/modules/graphviz/graphviz.module
index 8569302..12fdb27 100644
--- a/modules/graphviz/graphviz.module
+++ b/modules/graphviz/graphviz.module
@@ -101,10 +101,12 @@ function graphviz_to_dot($graph) {
  * Theme implementation, returns graphviz container as HTML.
  */
 function theme_graphviz_container($vars) {
-  return '<xmp>' . graphviz_to_dot($vars['graph']) . '</xmp>';
+  $dot = graphviz_to_dot($vars['graph']);
+  return graphviz_filter_filterproc($dot);
 }
 
 
+
 function graphviz_graphapi_node_properties() {
   return array(
     'background-color' => 'Background Color',