Another alternative to fix the problem, but from the find_request_XXX side