fixed old2new map issues