Xavante compatibility fix (@Etiene)