Fix issue with encrypted bytes on retry