fix_map_bug and etc