Fix bug in how controller_ids are stored (s/b a tuple)