For #255 one last attempt at guiding the mapping deduction