Fix controller regression