correct timeout error & goroutine leak