Fix map change