Tweak to support 2.17.0, broadcast address