Fix map transition bug