This should fix the infinite recursion