corretly fixed the mapiing