Get rid of waitFor recursion