warning fixed and updated to xtend 2.5.1