diff --git a/ahserver/filestorage.py b/ahserver/filestorage.py
index 966859a..032df6d 100644
--- a/ahserver/filestorage.py
+++ b/ahserver/filestorage.py
@@ -105,8 +105,9 @@ class FileStorage:
 					str(v % paths[0]),
 					str(v % paths[1]),
 					str(v % paths[2]),
-					str(v % paths[3]),
-					name))
+					str(v % paths[3]))
+		_mkdir(path)
+		path = os.path.join(path, name)
 		return path
 
 	def remove(self, path):