moving to xtend 2.5.1