diff --git a/fanficdownloader/ffnet.py b/fanficdownloader/ffnet.py
index c4e1145d..43253042 100644
--- a/fanficdownloader/ffnet.py
+++ b/fanficdownloader/ffnet.py
@@ -267,7 +267,6 @@ class FFNet(FanfictionSiteAdapter):
 				self.storyUpdated = datetime.datetime(*time.strptime ( dateus, "'%m-%d-%y'" )[0:5])
 				logging.debug('self.storyUpdated=%s' % self.storyUpdated.strftime("%Y-%m-%dT%I:%M:%S"))
 
-		self.addSubject(self.storyStatus)
 		if len(urls) <= 0:
 			# no chapters found, try url by itself.
 			urls.append((self.url,self.storyName))
diff --git a/fanficdownloader/ficwad.py b/fanficdownloader/ficwad.py
index aa8db7fa..2f8fcdf4 100644
--- a/fanficdownloader/ficwad.py
+++ b/fanficdownloader/ficwad.py
@@ -159,7 +159,6 @@ class FicWad(FanfictionSiteAdapter):
 						self.numWords=ss.replace('words','').replace('&nbsp;','')
 						logging.debug('self.numWords=%s' % self.numWords)
 					
-		self.addSubject(self.storyStatus)
 		logging.debug('Story "%s" by %s' % (self.storyName, self.authorName))
 		
 		result = []
diff --git a/fanficdownloader/fpcom.py b/fanficdownloader/fpcom.py
index b7808132..7806af5c 100644
--- a/fanficdownloader/fpcom.py
+++ b/fanficdownloader/fpcom.py
@@ -242,7 +242,6 @@ class FPCom(FanfictionSiteAdapter):
 						self._processInfoLine (tdas[5])
 
 		self.authorURL = 'http://' + self.host + '/u/' + self.authorId
-		self.addSubject(self.storyStatus)
 		
 		return urls
 	
diff --git a/fanficdownloader/hpfiction.py b/fanficdownloader/hpfiction.py
index 9107b705..aeda7d36 100644
--- a/fanficdownloader/hpfiction.py
+++ b/fanficdownloader/hpfiction.py
@@ -227,7 +227,6 @@ class HPFiction(FanfictionSiteAdapter):
 					if title != "Story Index":
 						urls.append((url,title))
 
-		self.addSubject(self.storyStatus)
 		return urls
 
 	def getText(self, url):
diff --git a/fanficdownloader/mediaminer.py b/fanficdownloader/mediaminer.py
index 365131d5..660d7bd0 100644
--- a/fanficdownloader/mediaminer.py
+++ b/fanficdownloader/mediaminer.py
@@ -280,7 +280,6 @@ class MediaMiner(FanfictionSiteAdapter):
 		self.numChapters = unicode(numchapters)
 		logging.debug('self.numChapters=%s' % self.numChapters)
 		#logging.debug('urls=%s' % urls)
-		self.addSubject(self.storyStatus)
 		
 		return urls
 	
diff --git a/fanficdownloader/output.py b/fanficdownloader/output.py
index da7503e1..46b3d7e9 100644
--- a/fanficdownloader/output.py
+++ b/fanficdownloader/output.py
@@ -382,6 +382,8 @@ class EPubFanficWriter(FanficWriter):
 #		opf = open(opfFilePath, 'w')
 		self._writeFile(opfFilePath, CONTENT_START % (uuid.uuid4().urn, self.storyTitle, self.authorName, self.adapter.getLanguageId(), published, created, updated, calibre, description))
 
+		if self.adapter.storyStatus != 'Unknown':
+			self.adapter.addSubject(self.adapter.storyStatus)
 		i = 0
 		subjs = []
 		subjs = self.adapter.getSubjects()
diff --git a/fanficdownloader/potionsNsnitches.py b/fanficdownloader/potionsNsnitches.py
index 81cfec40..81bc0b51 100644
--- a/fanficdownloader/potionsNsnitches.py
+++ b/fanficdownloader/potionsNsnitches.py
@@ -314,7 +314,6 @@ class PotionsNSnitches(FanfictionSiteAdapter):
             logging.error('self.storyName is empty!!  Exitting!')
             exit(1)
 
-        self.addSubject(self.storyStatus)
         return result
     
     def getText(self, url):
diff --git a/fanficdownloader/twilighted.py b/fanficdownloader/twilighted.py
index 7d9ca430..f3b72e3c 100644
--- a/fanficdownloader/twilighted.py
+++ b/fanficdownloader/twilighted.py
@@ -267,7 +267,6 @@ class Twilighted(FanfictionSiteAdapter):
                                             logging.debug('Skipped Label \"%s\" Value \"%s\"' % (strs[ii], strs[ii+1]))
                                             ii = ii+2
                                 
-        self.addSubject(self.storyStatus)
         return result
 
     def getText(self, url):