real fix timeout bug