diff --git a/core/themes/engines/twig/twig.engine b/core/themes/engines/twig/twig.engine
index f299b6e..8936661 100644
--- a/core/themes/engines/twig/twig.engine
+++ b/core/themes/engines/twig/twig.engine
@@ -57,8 +57,7 @@ function twig_render_template($template_file, $variables) {
     $output['debug_prefix'] .= "\n<!-- CALL: theme('{$variables['theme_hook_original']}') -->";
     if (!empty($variables['theme_hook_suggestions'])) {
       $extension = twig_extension();
-      $current_template = explode('/', $template_file);
-      $current_template = array_pop($current_template);
+      $current_template = basename($template_file);
       $suggestions = $variables['theme_hook_suggestions'];
       $suggestions[] = $variables['theme_hook_original'];
       foreach ($suggestions as $key => &$suggestion) {
@@ -66,9 +65,9 @@ function twig_render_template($template_file, $variables) {
         $prefix = ($template == $current_template) ? 'x' : '*';
         $suggestion = $prefix . ' ' . str_replace('_', '-', $template);
       }
-      $output['debug_info'] .= "\n<!-- FILE NAME SUGGESTIONS:\n   " . implode("\n   ", $suggestions) . "\n -->";
+      $output['debug_info'] .= "\n<!-- FILE NAME SUGGESTIONS:\n   " . implode("\n   ", $suggestions) . "\n-->";
     }
-    $output['debug_info']   .= "\n<!-- BEGIN OUTPUT from '{$template_file}'  -->\n";
+    $output['debug_info']   .= "\n<!-- BEGIN OUTPUT from '{$template_file}' -->\n";
     $output['debug_suffix'] .= "\n<!-- END OUTPUT from '{$template_file}' -->\n\n";
   }
   return implode('', $output);