timeout bug fix