Fix ID -> NA conversion