fix timeout issues