Address nit

Add a wait_for to address failure