Move the rekey to yes always to avoid issues.