Key length fix