Infinit recursion fix