fix bug: addExtra mac should upper first
fix bug: mac in all location should be used upper()