BZ-13036 fixed address check