Fix for 'Crash unexpected on S3'