Mapkey fix