Redo the mapping by hand