Hopefully fixed infinite recursion.