Fix controller creation