Fix map change after tab change