add more timeout control to avoid concurrent connections prblem