diff --git a/README.md b/README.md
index 3a378fc..6f2d26f 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ##Stash
 
-![Release](https://img.shields.io/badge/release-3.0.3-brightgreen.svg)
+![Release](https://img.shields.io/badge/release-3.0.4-brightgreen.svg)
 
 Stash for ExpressionEngine 3.
 
diff --git a/system/user/addons/stash/config.php b/system/user/addons/stash/config.php
index 640902f..27bd7aa 100755
--- a/system/user/addons/stash/config.php
+++ b/system/user/addons/stash/config.php
@@ -2,7 +2,7 @@
 if (! defined('STASH_VER'))
 {
     define('STASH_NAME', 'Stash');
-    define('STASH_VER',  '3.0.3');
+    define('STASH_VER',  '3.0.4');
     define('STASH_AUTHOR',  'Mark Croxton, Hallmark Design');
     define('STASH_AUTHOR_URL',  'http://hallmark-design.co.uk');
     define('STASH_DOCS',  'http://github.com/croxton/Stash/');
diff --git a/system/user/addons/stash/mod.stash.php b/system/user/addons/stash/mod.stash.php
index 1268e30..9532e18 100755
--- a/system/user/addons/stash/mod.stash.php
+++ b/system/user/addons/stash/mod.stash.php
@@ -285,12 +285,14 @@ private function _load_EE_TMPL()
         // -------------------------------------
         if (ee()->extensions->active_hook('stash_load_template_class') === TRUE)
         {
-            ee()->TMPL = ee()->extensions->call('stash_load_template_class');
+            ee()->remove('TMPL');
+            ee()->set('TMPL', ee()->extensions->call('stash_load_template_class'));
         } 
         else 
         {
             require_once APPPATH.'libraries/Template.php';
-            ee()->TMPL = new EE_Template();
+            ee()->remove('TMPL');
+            ee()->set('TMPL', new EE_Template());
             ee()->TMPL->modules = array('stash');
         }
     }