diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfd34a4..61b30e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Generated assets are not visible on the Project window (#26)
 - Apply on play is not disabled if av3emulator is active on other scene
+- Avatar names with non-path-safe characters break builds (again) (#18)
 
 ### Changed
 
diff --git a/Editor/API/BuildContext.cs b/Editor/API/BuildContext.cs
index aea8486..1dd892d 100644
--- a/Editor/API/BuildContext.cs
+++ b/Editor/API/BuildContext.cs
@@ -97,7 +97,7 @@ public BuildContext(GameObject obj, string assetRootPath)
 
                 var pathAvatarName = FilterAvatarName(avatarName);
                 
-                var avatarPath = Path.Combine(assetRootPath, avatarName) + ".asset";
+                var avatarPath = Path.Combine(assetRootPath, pathAvatarName) + ".asset";
                 AssetDatabase.GenerateUniqueAssetPath(avatarPath);
                 AssetDatabase.CreateAsset(AssetContainer, avatarPath);
                 if (string.IsNullOrEmpty(AssetDatabase.GetAssetPath(AssetContainer)))