migrate on Xtend 2.4.2