Attempt to fix recursive search.