Trying to fix timeout bug.