Fix endless recursion