Fix the bug in MAC