diff --git a/lib/objavi/fmbook.py b/lib/objavi/fmbook.py
index d67c700..cc65707 100644
--- a/lib/objavi/fmbook.py
+++ b/lib/objavi/fmbook.py
@@ -318,7 +318,7 @@ def filepath(self, fn):
     def save_tempfile(self, fn, data):
         """Save the data in a temporary directory that will be cleaned
         up when all is done.  Return the absolute file path."""
-        fn = self.filepath(fn)
+        #fn = self.filepath(fn)
         save_data(fn, data)
         return fn
 
@@ -539,7 +539,8 @@ def make_templated_html(self, template=None, index=config.TEMPLATING_INDEX_FIRST
         """Make a templated html version of the book."""
         #set up the directory and static files
         self.unpack_static()
-        destdir = self.filepath(os.path.basename(self.publish_file))
+        #destdir = self.filepath(os.path.basename(self.publish_file))
+        destdir = self.publish_file
         os.mkdir(destdir)
 
         src = self.filepath('static')