Fix NG Cloak Issue