Fixed some infinite recursion