Corrected UN mapping