bug fix timeout handling