diff --git a/app/code/community/Pagespeed/Js/Model/Observer.php b/app/code/community/Pagespeed/Js/Model/Observer.php
index 855fd61..0ef43b3 100644
--- a/app/code/community/Pagespeed/Js/Model/Observer.php
+++ b/app/code/community/Pagespeed/Js/Model/Observer.php
@@ -89,7 +89,7 @@ public function parseJsToBottom(Varien_Event_Observer $observer)
         if (!$helper->isEnabled()) return;
 
         // Step 2
-        $response = $observer->getFront()->getResponse();
+        $response = $observer->getResponse();
         $html = $response->getBody();
         $this->excludeList = $helper->getExcludeList();
 
diff --git a/app/code/community/Pagespeed/Js/etc/config.xml b/app/code/community/Pagespeed/Js/etc/config.xml
index 6bed39a..b683f86 100644
--- a/app/code/community/Pagespeed/Js/etc/config.xml
+++ b/app/code/community/Pagespeed/Js/etc/config.xml
@@ -20,7 +20,7 @@
             <!--
                 Event before the response has been sent to browser
             -->
-            <controller_front_send_response_before>
+            <http_response_send_before>
                 <observers>
                     <pagespeed_js_response_before>
                         <type>singleton</type>
@@ -28,7 +28,7 @@
                         <method>parseJsToBottom</method>
                     </pagespeed_js_response_before>
                 </observers>
-            </controller_front_send_response_before>
+            </http_response_send_before>
         </events>
     </frontend>