Fix regression which left fields base64-encoded