Trying to fix the key expansion with correct number of keys.