Apply @thejh fix for base64