ATTEMPT TO FIX