Applied patch from Toby Cabot to fix a small bug in address handling.