diff --git a/package.json b/package.json
index b586a37..13423fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdir/amphtml-bundle",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Amphtml Bundle for Contao 4",
   "scripts": {},
   "repository": {
diff --git a/src/Resources/contao/classes/AmphtmlHooks.php b/src/Resources/contao/classes/AmphtmlHooks.php
index b29e1c6..24c1d9d 100644
--- a/src/Resources/contao/classes/AmphtmlHooks.php
+++ b/src/Resources/contao/classes/AmphtmlHooks.php
@@ -43,7 +43,7 @@ public function ampGetPageLayout($objPage, &$objLayout, $objPty)
                 $objLayout->head .= '<link rel="amphtml" href="' . $strUrl . '?amp" />';
             }
 
-            if(\Input::get('amp') !== null)
+            if(isset($_GET['amp']))
             {
                 $ampLayout = (int) \PageModel::findByPk($objPage->rootId)->ampLayout;
                 $ampUseInLayout = \PageModel::findByPk($objPage->rootId)->ampUseInLayout;
@@ -107,7 +107,7 @@ public function ampGetPageLayout($objPage, &$objLayout, $objPty)
      */
     public function ampGenerateFrontendUrl($arrRow, $strParams, $strUrl)
     {
-        if(\Input::get('amp') !== null)
+        if(isset($_GET['amp']))
         {
             return $strUrl = $strUrl . '?amp';
         }
@@ -120,12 +120,11 @@ public function ampGenerateFrontendUrl($arrRow, $strParams, $strUrl)
      */
     public function unbindDynamicScriptTags($strBuffer)
     {
-        if(\Input::get('amp') !== null)
+        if(isset($_GET['amp']))
         {
             $search  = array('[[TL_HEAD]]', '[[TL_CSS]]');
             $replace = array('', '');
             return str_replace($search, $replace, $strBuffer);
-            // return ' ';
         }
 
         return $strBuffer;
diff --git a/src/Resources/contao/config/config.php b/src/Resources/contao/config/config.php
index 384fe94..5d28026 100644
--- a/src/Resources/contao/config/config.php
+++ b/src/Resources/contao/config/config.php
@@ -6,4 +6,4 @@
 $GLOBALS['TL_HOOKS']['getPageLayout'][] = array('\Pdir\AmphtmlHooks', 'ampGetPageLayout');
 $GLOBALS['TL_HOOKS']['generateFrontendUrl'][] = array('\Pdir\AmphtmlHooks', 'ampGenerateFrontendUrl');
 $GLOBALS['TL_HOOKS']['replaceDynamicScriptTags'][] = array('\Pdir\AmphtmlHooks', 'unbindDynamicScriptTags');
-$GLOBALS['TL_HOOKS']['generateFrontendUrl'][] = array('\Pdir\AmphtmlHooks', 'ampGenerateFrontendUrl');
\ No newline at end of file
+//$GLOBALS['TL_HOOKS']['generateFrontendUrl'][] = array('\Pdir\AmphtmlHooks', 'ampGenerateFrontendUrl');
\ No newline at end of file