Fix controller generator