Xhrfields fix