Controller & Router fixed