Controller fixe due to framework updates