Need to fix infinite recursion and depth issue