Fix repeat initial_wait