Fixed an issue with XHR timeouts