Fixing AppRouter