adjust to rekey changes