diff --git a/namekoplus/chassis-agent/metric-configs/grafana.json.mako b/namekoplus/chassis-agent/metric-configs/grafana.json.mako
index 88b4490..b60dfe0 100644
--- a/namekoplus/chassis-agent/metric-configs/grafana.json.mako
+++ b/namekoplus/chassis-agent/metric-configs/grafana.json.mako
@@ -28,7 +28,7 @@
   "links": [],
   "liveNow": false,
   "panels": [
-    % for grafana_dict in grafana_list:
+% for grafana_dict in grafana_list:
     {
       "aliasColors": {},
       "bars": false,
@@ -115,12 +115,12 @@
       "yaxis": {
         "align": false
       }
-        % if ${grafana_dict['is_last']}:
+  % if ${grafana_dict['is_last']}:
     }
-        % else:
+  % else:
     },
-        % endif
-    % endfor
+  % endif
+% endfor
   ],
   "refresh": "3s",
   "schemaVersion": 36,
diff --git a/namekoplus/command.py b/namekoplus/command.py
index eadcdef..bd34392 100644
--- a/namekoplus/command.py
+++ b/namekoplus/command.py
@@ -364,13 +364,14 @@ def metric_config_gen(module, class_name_str):
     with status(f'Creating files of Grafana.json into the directory of grafana_dashboards'):
         for class_name in class_name_str.split(','):
             grafana_list = []
-            for idx, config in enumerate(config_list):
+            for config in config_list:
                 if config['class_name'] == class_name:
-                    if idx+1 == len(config_list):
-                        config['is_last'] = True
-                    else:
-                        config['is_last'] = False
                     grafana_list.append(config)
+            for idx, grafana_dict in enumerate(grafana_list):
+                if idx + 1 == len(grafana_list):
+                    grafana_dict['is_last'] = True
+                else:
+                    grafana_dict['is_last'] = False
             grafana_configs_dir = os.path.join(get_directory('chassis-agent'), 'metric-configs')
             grafana_file_path = os.path.join(grafana_configs_dir, 'grafana.json.mako')
             output_file = os.path.join('grafana_dashboards', f'{class_name}_Grafana.json')
diff --git a/setup.py b/setup.py
index b98f139..88380ac 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ with open(path.join(here, 'README.md'), encoding='utf-8') as f:
 
 setup(
     name='namekoplus',
-    version='0.4.18',
+    version='0.4.19',
     description='A lightweight Python distributed microservice solution',
     long_description=long_description,
     long_description_content_type='text/markdown',