Fix controller lock issue