another define-fix (is ip-addr mac-addr-based)