Change logic for mapping warning