diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp
index 981203abb..91f0dc906 100644
--- a/code/FBXConverter.cpp
+++ b/code/FBXConverter.cpp
@@ -73,10 +73,6 @@ using namespace Util;
 
 #define CONVERT_FBX_TIME(time) static_cast<double>(time) / 46186158000L
 
-// XXX vc9's debugger won't step into anonymous namespaces
-//namespace {
-
-
 Converter::Converter( aiScene* out, const Document& doc )
 : defaultMaterialIndex()
 , out( out )
@@ -407,14 +403,15 @@ static bool HasName( NodeNameCache &cache, const std::string &name ) {
     return it != cache.end();
 
 }
-void Converter::GetUniqueName( const std::string &name, std::string uniqueName ) {
+void Converter::GetUniqueName( const std::string &name, std::string &uniqueName ) {
     if ( !HasName( mNodeNames, name ) ) {
         uniqueName = name;
+        mNodeNames.push_back( uniqueName );
         return;
     }
 
     int i( 0 );
-    std::string newName;
+    std::string newName( name );
     while ( HasName( mNodeNames, newName ) ) {
         ++i;
         newName.clear();
@@ -3100,8 +3097,6 @@ void Converter::TransferDataToScene()
     }
 }
 
-//} // !anon
-
 // ------------------------------------------------------------------------------------------------
 void ConvertToAssimpScene(aiScene* out, const Document& doc)
 {
diff --git a/code/FBXConverter.h b/code/FBXConverter.h
index fca42e8d7..2c0810d94 100644
--- a/code/FBXConverter.h
+++ b/code/FBXConverter.h
@@ -131,7 +131,7 @@ private:
     void ConvertCamera( const Camera& cam, const std::string &orig_name );
 
     // ------------------------------------------------------------------------------------------------
-    void GetUniqueName( const std::string &name, std::string uniqueName );
+    void GetUniqueName( const std::string &name, std::string& uniqueName );
 
     // ------------------------------------------------------------------------------------------------
     // this returns unified names usable within assimp identifiers (i.e. no space characters -