Fix for recursion issue