Fix null $controller