diff --git a/Million Hunter/HunterMainForm.cs b/Million Hunter/HunterMainForm.cs
index 11588f1..c0a377e 100644
--- a/Million Hunter/HunterMainForm.cs	
+++ b/Million Hunter/HunterMainForm.cs	
@@ -620,8 +620,8 @@ namespace Million
 
                 //remove
                 foreach (var key in standardData.Keys) {
-                    if (standardData[key].Count > 400)
-                        standardData[key].RemoveAt(0);
+                    if (standardData[key].Count > 1000)
+                        standardData[key].RemoveRange(900, standardData[key].Count - 900);
                 }
 
                 //1분씩 증가하면서 나머지 처리
diff --git a/Million/Manager/CalculateManager.cs b/Million/Manager/CalculateManager.cs
index 3f543a9..eb1fd77 100644
--- a/Million/Manager/CalculateManager.cs
+++ b/Million/Manager/CalculateManager.cs
@@ -1085,6 +1085,7 @@ namespace Million.Manager
             foreach (var item in parentCandleDataList)
             {
                 double indiLowData = 0, indiHighData = 0;
+                if (!item.IndicatorDic.ContainsKey(key)) continue;
                 if(item.IndicatorDic[key].GetType() == typeof(IchimokData))
                 {
                     indiHighData = indiLowData = GetValueData(setUp, item, key);