Fixed duplicate controllers issue