diff --git a/taggerwindow.py b/taggerwindow.py
index 9286d8b..bfa3667 100644
--- a/taggerwindow.py
+++ b/taggerwindow.py
@@ -485,6 +485,7 @@ class TaggerWindow( QtGui.QMainWindow):
 	def actualLoadCurrentArchive( self ):
 		if self.metadata.isEmpty:
 			self.metadata = self.comic_archive.metadataFromFilename( )
+		if len(self.metadata.pages) == 0:
 			self.metadata.setDefaultPageList( self.comic_archive.getNumberOfPages() )
 
 		self.updateCoverImage()
diff --git a/todo.txt b/todo.txt
index 523c9c1..ad92f1a 100644
--- a/todo.txt
+++ b/todo.txt
@@ -15,7 +15,6 @@ Look into using libarchive
 -----------------------------------------------------
 Bugs	
 -----------------------------------------------------
-Auto-Tag doesn't save page list info!
 
 Rar flakes out when a space is at the front of the subfolder in the archive.
 Zip flakes out when filename differs from index (or whatever)  i.e "\" vs "/". Python issue