Fix duplicate controllers