Working in fix for recursion issue