Fix controller sub