Fix for protobuf business