diff --git a/system/src/App/App.php b/system/src/App/App.php
index 17e4242b..20f1e383 100644
--- a/system/src/App/App.php
+++ b/system/src/App/App.php
@@ -10,7 +10,7 @@ use MyAAC\Services\RouterService;
 use MyAAC\Services\StatusService;
 use MyAAC\Settings;
 use MyAAC\Visitors;
-use Twig\Environment;
+use MyAAC\Twig\EnvironmentBridge as MyAAC_Twig_EnvironmentBridge;
 use Twig\Loader\FilesystemLoader;
 
 class App
@@ -126,7 +126,7 @@ class App
 
 				case 'twig':
 					$dev_mode = (config('env') === 'dev');
-					$this->instances[$what] = new Environment($this->get('twig-loader'), array(
+					$this->instances[$what] = new MyAAC_Twig_EnvironmentBridge($this->get('twig-loader'), array(
 						'cache' => CACHE . 'twig/',
 						'auto_reload' => $dev_mode,
 						'debug' => $dev_mode
diff --git a/system/twig.php b/system/twig.php
index a0f61453..71478c52 100644
--- a/system/twig.php
+++ b/system/twig.php
@@ -9,7 +9,6 @@
  */
 defined('MYAAC') or die('Direct access not allowed!');
 
-use MyAAC\Twig\EnvironmentBridge as MyAAC_Twig_EnvironmentBridge;
 use Twig\Extension\DebugExtension as Twig_DebugExtension;
 use Twig\TwigFilter;
 use Twig\TwigFunction;