fixed the mapping