Fix to controller