"Fix" recursion bug