S3 registration fixed