Fixing XFM handling