Map interface corrected