Controller fixed