#3767 putting the right mapping