OEM keys length fix