diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index d73bb7c..e6f3040 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.0.349")]
-[assembly: AssemblyFileVersion("3.0.0.349")]
+[assembly: AssemblyVersion("3.0.0.350")]
+[assembly: AssemblyFileVersion("3.0.0.350")]
diff --git a/Core/PagesStorageProvider.cs b/Core/PagesStorageProvider.cs
index 0fb8134..1b6955c 100644
--- a/Core/PagesStorageProvider.cs
+++ b/Core/PagesStorageProvider.cs
@@ -1690,6 +1690,7 @@ namespace ScrewTurn.Wiki {
 							UnindexMessageTree(local, msg);
 						}
 
+						string oldFullName = local.FullName;
 						local.FullName = NameTools.GetFullName(NameTools.GetNamespace(local.FullName), newName);
 
 						string newFile = GetNamespacePartialPathForPageContent(NameTools.GetNamespace(local.FullName)) + newName +
@@ -1714,12 +1715,13 @@ namespace ScrewTurn.Wiki {
 							File.Move(oldDraftFullPath, newDraftFullPath);
 						}
 
+						// Rename all backups, store new page list on disk
+						// and rebind new page with old categories
+						RenameBackups(new LocalPageInfo(oldFullName, this, local.CreationDateTime, oldLocalName), newName);
+
 						// Set new filename (local references an element in the pgs array)
 						local.File = newFile;
 
-						// Rename all backups, store new page list on disk
-						// and rebind new page with old categories
-						RenameBackups(page, newName);
 						DumpPages(pgs);
 						// Clear internal cache
 						categoriesCache = null;