Fix infinite recursion?