Switched order of controllers, fixing resolution order