Fix #83

This change require https://git.eclipse.org/r/#/c/21786/
Merge pull request #84 from zulus/bug_83

Fix #83