temporary recursion fix