Fixed support for multiple controllers.