Some changes for fix timeout