MB-34 #comment fixing the peer address issue