CRUCIAL FIX