Created attachment 141309 [details] [review]
possible fix

This patch should help but please check if you can pass several S3 cycles with
it.