Eliminated endless recursion