Backfix a fix needed by XML module