fix in application_controller