fixing the mapping