Try fixing recursion