Fix map key issue