Integrating xhr bug fix