Device mac bug fixed