small modif on mapping