diff --git a/src/source/RazorEngine.Core/Templating/WatchingResolvePathTemplateManager.cs b/src/source/RazorEngine.Core/Templating/WatchingResolvePathTemplateManager.cs
index 7aff5d48..9757a8a0 100644
--- a/src/source/RazorEngine.Core/Templating/WatchingResolvePathTemplateManager.cs
+++ b/src/source/RazorEngine.Core/Templating/WatchingResolvePathTemplateManager.cs
@@ -83,8 +83,8 @@ void watcher_Changed(object sender, FileSystemEventArgs e)
 
         void watcher_Renamed(object sender, RenamedEventArgs e)
         {
-            watcher_Changed(sender, new FileSystemEventArgs(WatcherChangeTypes.Deleted, e.OldFullPath, e.OldName));
-            watcher_Changed(sender, new FileSystemEventArgs(WatcherChangeTypes.Created, e.FullPath, e.Name));
+            watcher_Changed(sender, new FileSystemEventArgs(WatcherChangeTypes.Deleted, Path.GetDirectoryName(e.OldFullPath) ?? e.OldFullPath, e.OldName));
+            watcher_Changed(sender, new FileSystemEventArgs(WatcherChangeTypes.Created, Path.GetDirectoryName(e.FullPath) ?? e.FullPath, e.Name));
         }
 
         /// <summary>