fixing timeout setup more