[FIX] broken by route change