Tried to fix timeout bug