adapted to Xtend 2.4