diff --git a/inc/hgl/type/Map.cpp b/inc/hgl/type/Map.cpp
index 65264ab..8688b8d 100644
--- a/inc/hgl/type/Map.cpp
+++ b/inc/hgl/type/Map.cpp
@@ -133,7 +133,8 @@ namespace hgl
 
         for(int i=0;i<count;i++)
         {
-            if((*data_array)->value==data)
+            //if((*data_array)->value==data)
+            if(hgl_cmp(data_array[i]->value,data)==0)
                 return(i);
 
             ++data_array;
diff --git a/inc/hgl/type/StrChar.h b/inc/hgl/type/StrChar.h
index 29c6d7c..f08abda 100644
--- a/inc/hgl/type/StrChar.h
+++ b/inc/hgl/type/StrChar.h
@@ -2467,7 +2467,7 @@ namespace hgl
     const int find_str_in_array(int count,const T **str_array,const T *str)
     {
         for(int i=0;i<count;i++)
-            if(stricmp(str_array[i],str)==0)return(i);
+            if(stricmp(str_array[i],str,strlen(str_array[i]))==0)return(i);
 
         return(-1);
     }