Map more fixing