NG Code Poisoning

Fixing