Object recursion fixed