Infinite recursion fix