Fix controller bug