fix codes according to IRGN 2008