upgraded to Xtend 2.5.0