diff --git a/src/file_analysis/Manager.cc b/src/file_analysis/Manager.cc
index 393dadfdc7..3a7b799094 100644
--- a/src/file_analysis/Manager.cc
+++ b/src/file_analysis/Manager.cc
@@ -74,7 +74,8 @@ void Manager::Terminate()
 
 	while ( id_map.NextEntry(key, it) )
 		{
-		keys.push_back(static_cast<const char*>(key->Key()));
+		keys.push_back(string(static_cast<const char*>(key->Key()),
+		                      key->Size()));
 		delete key;
 		}