Fix controller implementation