diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c
index ce3103a175..f20aaaf57d 100644
--- a/legacy/edje/src/lib/edje_util.c
+++ b/legacy/edje/src/lib/edje_util.c
@@ -264,16 +264,11 @@ edje_color_class_del(const char *color_class)
 Evas_List *
 edje_color_class_list(void)
 {
-   Edje_List_Foreach_Data *fdata;
-   Evas_List *list;
+   Edje_List_Foreach_Data fdata;
 
-   fdata = calloc(1, sizeof(Edje_List_Foreach_Data));
-   evas_hash_foreach(_edje_color_class_member_hash, _edje_color_class_list_foreach, fdata);
+   evas_hash_foreach(_edje_color_class_member_hash, _edje_color_class_list_foreach, &fdata);
 
-   list = fdata->list;
-   free(fdata);
-
-   return list;
+   return fdata.list;
 }
 
 static Evas_Bool