Fix for https://github.com/timmolter/XChange/issues/107