(mapping) Fix a bug with Xtend 2.3.1 and below