Fix unintential recursion