diff --git a/src/main/java/me/bytebeats/mns/handler/AbsStockHandler.java b/src/main/java/me/bytebeats/mns/handler/AbsStockHandler.java
index 9f40daa..3c9ae8b 100644
--- a/src/main/java/me/bytebeats/mns/handler/AbsStockHandler.java
+++ b/src/main/java/me/bytebeats/mns/handler/AbsStockHandler.java
@@ -89,12 +89,11 @@ public Object[][] convert2Data() {
             if (isInHiddenMode()) {
                 name = PinyinUtils.toPinyin(name);
             }
-            if (i < stocks.size()) {//ArrayIndexOutOfBoundsException from issues: https://github.com/bytebeats/mns/issues/76
-                data[i] = new Object[]{name, stock.getSymbol(), stock.getLatestPrice(), stock.getChange(),
-                        stock.getChangeRatioString()};
+            data[i] = new Object[]{name, stock.getSymbol(), stock.getLatestPrice(), stock.getChange(),
+                    stock.getChangeRatioString()};
+            //ArrayIndexOutOfBoundsException from issues: https://github.com/bytebeats/mns/issues/76
+            if(i < stockColumnNames.length) {
                 columnTextColors.put(i, stock.getChange());
-            } else {
-                break;
             }
         }
         return data;