Fixed: Routers didn't copy old context