Worked around problem with Xtend 2.5.2