Fix abort recursion