6 Fix controller