Fix problem with the base64 encoding