Fix Minor Bug about map_count