fix the timeout issue