Fixed to support nested router handlers.