Fix build, Fix an infinite recursion