fixed controller assignments