Fix controller again.