Merge pull request #1139 from hzhuang1/fix_edmac

Fix edmac