Fixed handling of ProtocolInfo