Controler fix