Fix controller plugin