Attempt to fix the remaining key re-exchange bug