Fixed additional recursion errors