Fix inconsistent mapping