Fix XSSI issue