Fix to fit new controllers