Fixed: DynamicRouter didn't keep original context neither