fix for XDM 0.5.15 and above