Fix for Controller instanciation.