diff --git a/kernel/classes/ezhttpheader.php b/kernel/classes/ezhttpheader.php
index b403774f36c..57a1fa6ce46 100644
--- a/kernel/classes/ezhttpheader.php
+++ b/kernel/classes/ezhttpheader.php
@@ -121,7 +121,7 @@ static function headerOverrideArray( $uri )
                         $headerValue = gmdate( 'D, d M Y H:i:s', time() + $headerValue ) . ' GMT';
                     }
 
-                    if ( $depth === null )
+                    if ( $depth === null || $uriString === $path )
                     {
                         $headerArray[$header] = $headerValue;
                     }
@@ -129,6 +129,10 @@ static function headerOverrideArray( $uri )
                     {
                         $pathLevel = count( explode( '/', $path ) );
                         $uriLevel = count( explode( '/', $uriString ) );
+                        if ( $path == '/' )
+                        {
+                            $pathLevel--;
+                        }
                         if ( $level === null )
                         {
                             if ( $uriLevel <= $pathLevel + $depth )