Tried to fix Base64 issue