Fixed JSON infinite recursion