FIX a recursion bug