Avoid using deprecated WaitAction