xtend 2.7.1 adapted