Fixed issue with network timeouts