Handle connected controllers correctly. (Thanks to RachelB)