xdr fix hopefully