Fix controller situation