Minor fix in mapper