Fix base64 issue