diff --git a/Assets/XCharts/CHANGELOG-EN.md b/Assets/XCharts/CHANGELOG-EN.md
index 87bc63b9..0daedd88 100644
--- a/Assets/XCharts/CHANGELOG-EN.md
+++ b/Assets/XCharts/CHANGELOG-EN.md
@@ -33,6 +33,8 @@
 
 ## Latest
 
+* (2021.04.12) Fixed problem `missing class attribute 'ExtensionOfNativeClass'` after Theme refactoring #131
+
 ## v2.1.0
 
 * (2021.04.07) Release `v2.1.0` version
diff --git a/Assets/XCharts/CHANGELOG.md b/Assets/XCharts/CHANGELOG.md
index e3f0ecd8..c40964da 100644
--- a/Assets/XCharts/CHANGELOG.md
+++ b/Assets/XCharts/CHANGELOG.md
@@ -33,6 +33,8 @@
 
 ## Latest
 
+* (2021.04.12) 修复`Theme`重构后引起的`missing class attribute 'ExtensionOfNativeClass'`的问题 #131
+
 ## v2.1.0
 
 * (2021.04.07) 发布`v2.1.0`版本
diff --git a/Assets/XCharts/Runtime/Component/Theme/ChartTheme.cs.meta b/Assets/XCharts/Runtime/Component/Theme/ChartTheme.cs.meta
index 9b00c9dc..aae9983e 100644
--- a/Assets/XCharts/Runtime/Component/Theme/ChartTheme.cs.meta
+++ b/Assets/XCharts/Runtime/Component/Theme/ChartTheme.cs.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6f28c6b3fb24d49afbe348cfadd0e1c7
+guid: 6f28c6b3fb24d49afbe348cfadd0e1c8
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2
diff --git a/Assets/XCharts/Runtime/Internal/BaseChart.cs b/Assets/XCharts/Runtime/Internal/BaseChart.cs
index f951bfa1..c00a0307 100644
--- a/Assets/XCharts/Runtime/Internal/BaseChart.cs
+++ b/Assets/XCharts/Runtime/Internal/BaseChart.cs
@@ -107,21 +107,7 @@ namespace XCharts
 
         protected override void Awake()
         {
-            if (m_Theme == null)
-            {
-                m_Theme = ChartTheme.Default;
-            }
-            else
-            {
-                if (m_Theme.font == null)
-                {
-                    m_Theme.font = XChartsSettings.font;
-                }
-                if (m_Theme.colorPalette.Count == 0)
-                {
-                    m_Theme.ResetTheme();
-                }
-            }
+            CheckTheme();
             base.Awake();
             m_Series.AnimationReset();
             m_Series.AnimationFadeIn();
@@ -213,12 +199,27 @@ namespace XCharts
 
         protected virtual void CheckTheme()
         {
-            if (m_Theme != null && m_CheckTheme != m_Theme.theme)
+            if (m_Theme == null)
             {
-                m_CheckTheme = m_Theme.theme;
-                m_Theme.CopyTheme(m_CheckTheme);
-                SetAllComponentDirty();
-                OnThemeChanged();
+                m_Theme = ChartTheme.Default;
+            }
+            else
+            {
+                if (m_Theme.font == null)
+                {
+                    m_Theme.font = XChartsSettings.font;
+                }
+                if (m_Theme.colorPalette.Count == 0)
+                {
+                    m_Theme.ResetTheme();
+                }
+                if (m_CheckTheme != m_Theme.theme)
+                {
+                    m_CheckTheme = m_Theme.theme;
+                    m_Theme.CopyTheme(m_CheckTheme);
+                    SetAllComponentDirty();
+                    OnThemeChanged();
+                }
             }
         }
         protected override void CheckComponent()