RouterRequestHandler fix