Fix wait for started