fix for XDI/JSON/GOM