fix for recursion issue