BROKEN: Fix Factory Infinite recursion bug.