Fix parent/child recursion bug