Fixes so it use correct controllers.