diff --git a/src/create_torrent.cpp b/src/create_torrent.cpp
index 510007af5..5fa8f056c 100644
--- a/src/create_torrent.cpp
+++ b/src/create_torrent.cpp
@@ -194,10 +194,12 @@ namespace libtorrent
 		, boost::function<void(int)> f, error_code& ec)
 	{
 		file_pool fp;
-		std::string path = complete(p);
 #if TORRENT_USE_UNC_PATHS
-		path = canonicalize_path(path);
+		std::string path = canonicalize_path(p);
+#else
+		std::string const& path = p;
 #endif
+
 		boost::scoped_ptr<storage_interface> st(
 			default_storage_constructor(const_cast<file_storage&>(t.files()), 0, path, fp
 			, std::vector<boost::uint8_t>()));
diff --git a/src/storage.cpp b/src/storage.cpp
index ccfe5de42..03ae6ee68 100644
--- a/src/storage.cpp
+++ b/src/storage.cpp
@@ -391,7 +391,6 @@ namespace libtorrent
 		, m_page_size(page_size())
 		, m_allocate_files(false)
 	{
-		TORRENT_ASSERT(is_complete(path));
 		if (mapped) m_mapped_files.reset(new file_storage(*mapped));
 
 		TORRENT_ASSERT(m_files.begin() != m_files.end());