Fix #83

This change require https://git.eclipse.org/r/#/c/21786/