The key in the template_path_stack array is set correctly now.