better handling of protocol addressing