Fixed AppRouter