fixed some rekey collision issues