Macro Corrupted Owner Chain Fix for Master Branch

Fix macro corrupted owner chain problem for master branch.