diff --git a/Scripts/BlendShape/Editor/PreviewEditor.cs b/Scripts/BlendShape/Editor/PreviewEditor.cs
index 3a1bc8ace..7c451d222 100644
--- a/Scripts/BlendShape/Editor/PreviewEditor.cs
+++ b/Scripts/BlendShape/Editor/PreviewEditor.cs
@@ -2,6 +2,8 @@
 using UnityEngine;
 using UnityEditorInternal;
 using System;
+using System.Linq;
+using System.Collections.Generic;
 
 namespace VRM
 {
@@ -82,7 +84,7 @@ namespace VRM
         /// <param name="values"></param>
         /// <param name="materialValues"></param>
         /// <param name="weight"></param>
-        protected void Bake(BlendShapeBinding[] values, MaterialValueBinding[] materialValues, float weight)
+        protected void Bake(IEnumerable<BlendShapeBinding> values, IEnumerable<MaterialValueBinding> materialValues, float weight)
         {
             if (m_scene != null)
             {
@@ -93,7 +95,7 @@ namespace VRM
 
         protected void Bake(BlendShapeClip clip, float weight)
         {
-            Bake(clip.Values, clip.MaterialValues, weight);
+            Bake(Enumerable.Empty<BlendShapeBinding>(), Enumerable.Empty<MaterialValueBinding>(), weight);
         }
 
         protected virtual GameObject GetPrefab()
diff --git a/Scripts/BlendShape/MeshPreviewItem.cs b/Scripts/BlendShape/MeshPreviewItem.cs
index 8f5c0316c..0280f185b 100644
--- a/Scripts/BlendShape/MeshPreviewItem.cs
+++ b/Scripts/BlendShape/MeshPreviewItem.cs
@@ -153,7 +153,7 @@ namespace VRM
             Materials = materials;
         }
 
-        public void Bake(BlendShapeBinding[] values, float weight)
+        public void Bake(IEnumerable<BlendShapeBinding> values, float weight)
         {
             if (SkinnedMeshRenderer == null) return;
 
diff --git a/Scripts/BlendShape/PreviewSceneManager.cs b/Scripts/BlendShape/PreviewSceneManager.cs
index d1025c8d0..2703b35e0 100644
--- a/Scripts/BlendShape/PreviewSceneManager.cs
+++ b/Scripts/BlendShape/PreviewSceneManager.cs
@@ -207,7 +207,10 @@ namespace VRM
 
 #if UNITY_EDITOR
         Bounds m_bounds;
-        public void Bake(BlendShapeBinding[] values = null, MaterialValueBinding[] materialValues = null, float weight = 1.0f)
+        public void Bake(
+            IEnumerable<BlendShapeBinding> values = null,
+            IEnumerable<MaterialValueBinding> materialValues = null,
+            float weight = 1.0f)
         {
             //Debug.LogFormat("Bake");
             m_bounds = default(Bounds);
@@ -251,13 +254,6 @@ namespace VRM
 
         }
 #endif
-        /*
-        int PreviewLayer
-        {
-            get;
-            set;
-        }
-        */
 
         /// <summary>
         /// カメラパラメーターを決める