Fix infinite recursion...