Fix for protobuf payloads